Back to distutils, add upload command

diff --git a/Makefile b/Makefile
index 9b6366b18218f7fc88ccd6cc979aaff634847f64..93cf689d290f30344660da63a556795597c690fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,15 @@ default:
        @echo "  make doc              generate the documentation"
        @echo "  make view_doc         open the documentation index"
        @echo "  make clean            remove the generated files"
        @echo "  make doc              generate the documentation"
        @echo "  make view_doc         open the documentation index"
        @echo "  make clean            remove the generated files"

+       @echo "  make upload           upload the module on PyPI"

 
 .PHONY: build
 build:
        $(SETUP) build_ext --inplace
 
 .PHONY: test
 
 .PHONY: build
 build:
        $(SETUP) build_ext --inplace
 
 .PHONY: test

-test:
-       $(SETUP) test
+test: build
+       $(PYTHON) -m unittest -v

 
 .PHONY: doc
 doc:
 
 .PHONY: doc
 doc:


@@ -36,3 +37,7 @@ clean:
        $(RM) build dist MANIFEST venv LinPy.egg-info $(NAME)/_islhelper.*.so
        find . -name __pycache__ | xargs $(RM)
        $(MAKE) -C doc $@
        $(RM) build dist MANIFEST venv LinPy.egg-info $(NAME)/_islhelper.*.so
        find . -name __pycache__ | xargs $(RM)
        $(MAKE) -C doc $@

+
+.PHONY: upload
+upload:
+       $(SETUP) register sdist upload

diff --git a/setup.py b/setup.py
index 2aff11f619f506726b79f64822857901f1b09e33..72569e4abf3dfae7ff685f8a6836b5b376767495 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with LinPy.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with LinPy.  If not, see <http://www.gnu.org/licenses/>.
 

-from setuptools import setup, Extension
+from distutils.core import setup, Extension

 
 
 with open('linpy/_version.py') as file:
 
 
 with open('linpy/_version.py') as file:


@@ -39,6 +39,5 @@ setup(
         Extension('linpy._islhelper',
             sources=['linpy/_islhelper.c'],
             libraries=['isl'])
         Extension('linpy._islhelper',
             sources=['linpy/_islhelper.c'],
             libraries=['isl'])

-    ],
-    test_suite='linpy.tests'
+    ]

 )
 )