Skip to content

Commit 17ba10e

Browse files
committed
clean manifest and add wheels build in Makefile
1 parent 852e330 commit 17ba10e

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
graft ot/lp/
21
include README.md
2+
include RELEASES.md
33
include LICENSE
44
include ot/lp/core.h
55
include ot/lp/EMD.h

Makefile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PYTHON=python3
44
branch := $(shell git symbolic-ref --short -q HEAD)
5-
CIBW_BEFORE_BUILD="pip install numpy cython"
5+
66

77

88
help :
@@ -15,6 +15,7 @@ help :
1515
@echo " sremove - remove the package (system with sudo)"
1616
@echo " clean - remove any temporary files"
1717
@echo " notebook - launch ipython notebook"
18+
1819
build :
1920
$(PYTHON) setup.py build
2021

@@ -49,14 +50,15 @@ test : FORCE pep8
4950
pytest : FORCE
5051
$(PYTHON) -m pytest -v test/ --doctest-modules --ignore ot/gpu/ --cov=ot
5152

52-
uploadpypi :
53-
#python setup.py register
54-
$(PYTHON) setup.py sdist upload -r pypi
53+
release :
54+
twine upload dist/*
55+
56+
release_test :
57+
twine upload --repository-url https://test.pypi.org/legacy/ dist/*
5558

5659
rdoc :
5760
pandoc --from=markdown --to=rst --output=docs/source/readme.rst README.md
5861

59-
6062
notebook :
6163
ipython notebook --matplotlib=inline --notebook-dir=notebooks/
6264

@@ -76,7 +78,11 @@ autopep8 :
7678
aautopep8 :
7779
autopep8 -air test ot examples --jobs -1
7880

79-
wheels:
80-
cibuildwheel --platform linux --output-dir dist
81+
wheels :
82+
CIBW_BEFORE_BUILD="pip install numpy cython" cibuildwheel --platform linux --output-dir dist
83+
84+
dist : wheels
85+
$(PYTHON) setup.py sdist
86+
8187

8288
FORCE :

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ This toolbox has been created and is maintained by
166166

167167
The contributors to this library are
168168

169-
* [Rémi Flamary](http://remi.flamary.com/)
170-
* [Nicolas Courty](http://people.irisa.fr/Nicolas.Courty/)
171169
* [Alexandre Gramfort](http://alexandre.gramfort.net/)
172170
* [Laetitia Chapel](http://people.irisa.fr/Laetitia.Chapel/)
173171
* [Michael Perrot](http://perso.univ-st-etienne.fr/pem82055/) (Mapping estimation)

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
license = 'MIT',
5454
scripts=[],
5555
data_files=[],
56-
requires=["numpy","scipy","cython","matplotlib"],
57-
install_requires=["numpy","scipy","cython","matplotlib"],
56+
requires=["numpy","scipy","cython"],
57+
install_requires=["numpy","scipy","cython"],
5858
classifiers=[
5959
'Development Status :: 4 - Beta',
6060
'Intended Audience :: Developers',

0 commit comments

Comments
 (0)