From 916d092d8a3bc9b0f2097c4f6c953f3a69b668e7 Mon Sep 17 00:00:00 2001
From: Vivien Maisonneuve <v.maisonneuve@gmail.com>
Date: Sat, 23 Aug 2014 09:52:11 +0200
Subject: [PATCH 1/1] Back to distutils, add upload command
---
Makefile | 9 +++++++--
setup.py | 5 ++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 9b6366b..93cf689 100644
--- 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 upload upload the module on PyPI"
.PHONY: build
build:
$(SETUP) build_ext --inplace
.PHONY: test
-test:
- $(SETUP) test
+test: build
+ $(PYTHON) -m unittest -v
.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 $@
+
+.PHONY: upload
+upload:
+ $(SETUP) register sdist upload
diff --git a/setup.py b/setup.py
index 2aff11f..72569e4 100755
--- 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/>.
-from setuptools import setup, Extension
+from distutils.core import setup, Extension
with open('linpy/_version.py') as file:
@@ -39,6 +39,5 @@ setup(
Extension('linpy._islhelper',
sources=['linpy/_islhelper.c'],
libraries=['isl'])
- ],
- test_suite='linpy.tests'
+ ]
)
--
2.20.1