Skip to content

Commit 587a10c

Browse files
committed
work around issue with setuptools_rust
1 parent 4ece5b5 commit 587a10c

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

HISTORY.rst

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

5-
0.7.8 (2017-06-20)
5+
0.7.9 (2017-06-21)
66
------------------
77

88
* First release on PyPI.

MANIFEST.in

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11

22
include AUTHORS.rst
33

4+
45
include CONTRIBUTING.rst
56
include HISTORY.rst
67
include LICENSE
78
include README.rst
89

9-
recursive-include tests/ *.py
10-
recursive-exclude * __pycache__
11-
recursive-exclude * *.py[co]
12-
10+
recursive-include tests *.py
1311
recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
1412

1513
# we only want "release" artifacts, not "debug" artifacts
14+
# update this path if you move the rust folder
1615
recursive-include */rust/target/release *.so *.dylib *.dll *.lib
17-
recursive-include * *.h *.c
16+
# also don't end the path with a "/"
1817

19-
# inclusing the .rs and .toml files isn't necessary so feel free to remove them.
20-
# This may help if a source dist is needed.
21-
#recursive-include rust_pypi_example *.rs *.toml
18+
recursive-include * *.h
19+
20+
# This should help with the sdist
21+
recursive-include * *.c *.rs *.toml
22+
23+
recursive-exclude * __pycache__
24+
recursive-exclude * *.pyc
25+
recursive-exclude * *.pyo

scikit-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,20 @@ install:
2525

2626
before_build:
2727
commands:
28-
- $<RUN_ENV> $<PYTHON> setup.py clean
28+
- $<RUN_ENV> $<PYTHON> setup.py --verbose clean
2929

3030
build:
3131
commands:
32-
- $<RUN_ENV> $<PYTHON> setup.py bdist_wheel --plat-name=$<WHEELPLATFORM>
32+
- $<RUN_ENV> $<PYTHON> setup.py --verbose build_ext
33+
- $<RUN_ENV> $<PYTHON> setup.py --verbose bdist_wheel --plat-name=$<WHEELPLATFORM>
3334

3435
test:
3536
appveyor:
3637
environment:
3738
PATH: $<PYTHON_DIR>\\Scripts;$<PATH>
3839

3940
commands:
40-
- $<RUN_ENV> $<PYTHON> setup.py test
41+
- $<RUN_ENV> $<PYTHON> setup.py --verbose test
4142

4243
after_test:
4344
# commands:

setup.cfg

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ replace = {new_version}
1919
search = {current_version}
2020
replace = {new_version}
2121

22+
23+
2224
[flake8]
2325
exclude = docs
2426

@@ -27,5 +29,6 @@ test = pytest
2729

2830
[tool:pytest]
2931
testpaths = tests
30-
addopts = --verbose
3132

33+
34+
addopts = --verbose

0 commit comments

Comments
 (0)