nepi-3.2.5-pypi

diff --git a/Makefile b/Makefile
index f1a97d5..45a09de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB  = $(TESTDIR)/lib
+TESTLIB     = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
@@ -84,6 +84,9 @@ pypi:
        @echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
        git tag $(VERSIONTAG)
        ./setup.py sdist upload -r pypi
+       #./setup.py sdist upload -r pypi
+       ./setup.py sdist
+       twine upload dist/* -r pypi
        @if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAR) ] ;\
          then echo "$(VERSIONTAR) already present on $(PYPI_TARBALL_HOST) - ignored" ;\
          else rsync -av dist/$(VERSIONTAR) $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
@@ -95,4 +98,6 @@ pypi:
 # in this case we do not want to upload anything on the build box though
 
 testpypi: 
-       ./setup.py sdist upload -r testpypi
+       #./setup.py sdist upload -r testpypi
+       ./setup.py sdist
+       twine upload dist/* -r testpypi

diff --git a/VERSION b/VERSION
index 351227f..5ae69bd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.4
+3.2.5