Skip to content

Commit 784af86

Browse files
committed
use setuptools_rust instead of fork
1 parent 41d4916 commit 784af86

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

HISTORY.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
History
33
=======
44

5-
0.1.0 (2017-06-04)
5+
0.1.0 (2017-06-17)
66
------------------
77

88
* First release on PyPI.

Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,37 @@ clean-venv:
5555
rm -rf venv
5656

5757
lint: venv ## check style with flake8
58-
venv/bin/flake8 trust_pypi_example tests
58+
venv/bin/python -m flake8 trust_pypi_example tests
5959

6060
test: venv ## This will use py.test because of pytest-runner
6161
venv/bin/python setup.py check
6262
venv/bin/python setup.py test
6363

6464
venv: ## set up a virtualenv that will by python and install dependencies
6565
python -m virtualenv venv || python -m venv venv
66-
venv/bin/pip install -r requirements_dev.txt
66+
venv/bin/python -m pip install -r requirements_dev.txt
6767

6868

6969
test-all: venv ## run tests on every Python version with tox
7070
venv/bin/tox
7171

7272
coverage: venv ## check code coverage quickly with the default Python
73-
venv/bin/coverage run --source trust_pypi_example -m pytest
73+
venv/bin/python -m coverage run --source trust_pypi_example -m pytest
7474

75-
venv/bin/coverage report -m
76-
venv/bin/coverage html
75+
venv/bin/python -m coverage report -m
76+
venv/bin/python -m coverage html
7777
$(BROWSER) htmlcov/index.html
7878

7979
docs: venv ## generate Sphinx HTML documentation, including API docs
8080
rm -f docs/trust_pypi_example.rst
8181
rm -f docs/modules.rst
82-
venv/bin/sphinx-apidoc -o docs/ trust_pypi_example
82+
venv/bin/python -m sphinx-apidoc -o docs/ trust_pypi_example
8383
$(MAKE) -C docs clean
8484
$(MAKE) -C docs html
8585
$(BROWSER) docs/_build/html/index.html
8686

8787
servedocs: venv docs ## compile the docs watching for changes
88-
venv/bin/watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
88+
venv/bin/python -m watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
8989

9090
release: venv clean ## package and upload a release
9191
venv/bin/python setup.py sdist upload

requirements_dev.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ pytest>=2.9.2
1111
pytest-runner>=2.0
1212
Click>=6.0
1313

14-
# install fork of setuptools-rust which doesn't require pyo3 or rust-cython
15-
https://github.com/mckaymatt/setuptools-rust/archive/master.zip
14+
-e git://github.com/PyO3/setuptools-rust.git@706c499a1a390ab2d175d5b44116ea5cd8097bb2#egg=setuptools_rust

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from setuptools import setup, Distribution
55
try:
6-
from setuptools_rust import RustExtension
6+
from setuptools_rust import RustExtension, Binding
77
except ImportError:
88
import subprocess
99
print("\nsetuptools_rust is required before install - https://pypi.python.org/pypi/setuptools-rust")
@@ -52,7 +52,7 @@
5252
zip_safe=False,
5353
rust_extensions=[
5454
RustExtension('trust_pypi_example', 'trust_pypi_example/rust/Cargo.toml',
55-
debug=False, no_binding=True)],
55+
debug=False, binding=Binding.NoBinding)],
5656
keywords='trust_pypi_example',
5757
classifiers=[
5858
'Development Status :: 2 - Pre-Alpha',

0 commit comments

Comments
 (0)