Switch to twine and wheels

Legacy PyPI upload no longer supported, and universal wheels are
preferable to the old egg format

Author: waveform80

Makefile

@@ -5,6 +5,7 @@ PYTHON=python
 PIP=pip
 PYTEST=py.test
 COVERAGE=coverage
+TWINE=twine
 PYFLAGS=
 DEST_DIR=/
 
@@ -45,14 +46,14 @@ DOC_SOURCES:=
 SUBDIRS:=
 
 # Calculate the name of all outputs
-DIST_EGG=dist/$(NAME)-$(VER)-$(PYVER).egg
+DIST_WHEEL=dist/$(NAME)-$(VER)-py2.py3-none-any.whl
 DIST_TAR=dist/$(NAME)-$(VER).tar.gz
 DIST_ZIP=dist/$(NAME)-$(VER).zip
 DIST_DEB=dist/python-$(NAME)_$(VER)$(DEB_SUFFIX)_all.deb \
 	dist/python3-$(NAME)_$(VER)$(DEB_SUFFIX)_all.deb \
 	dist/python-$(NAME)-doc_$(VER)$(DEB_SUFFIX)_all.deb \
 	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).changes
-DIST_DSC=dist/$(NAME)_$(VER)$(DEB_SUFFIX).tar.gz \
+DIST_DSC=dist/$(NAME)_$(VER)$(DEB_SUFFIX).tar.xz \
 	dist/$(NAME)_$(VER)$(DEB_SUFFIX).dsc \
 	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes
 MAN_PAGES=man/pinout.1 man/remote-gpio.7
@@ -85,15 +86,15 @@ doc: $(DOC_SOURCES)
 
 source: $(DIST_TAR) $(DIST_ZIP)
 
-egg: $(DIST_EGG)
+wheel: $(DIST_WHEEL)
 
 zip: $(DIST_ZIP)
 
 tar: $(DIST_TAR)
 
 deb: $(DIST_DEB) $(DIST_DSC)
 
-dist: $(DIST_EGG) $(DIST_DEB) $(DIST_DSC) $(DIST_TAR) $(DIST_ZIP)
+dist: $(DIST_WHEEL) $(DIST_DEB) $(DIST_DSC) $(DIST_TAR) $(DIST_ZIP)
 
 develop: tags
 	@# These have to be done separately to avoid a cockup...
@@ -106,13 +107,11 @@ test:
 	$(COVERAGE) report --rcfile coverage.cfg
 
 clean:
-	$(PYTHON) $(PYFLAGS) setup.py clean
 	dh_clean
-	rm -fr build/ dist/ $(NAME).egg-info/ tags
+	rm -fr $(NAME).egg-info/ tags
 	for dir in $(SUBDIRS); do \
 		$(MAKE) -C $$dir clean; \
 	done
-	find $(CURDIR) -name "*.pyc" -delete
 
 tags: $(PY_SOURCES)
 	ctags -R --exclude="build/*" --exclude="debian/*" --exclude="docs/*" --languages="Python"
@@ -131,8 +130,8 @@ $(DIST_TAR): $(PY_SOURCES) $(SUBDIRS)
 $(DIST_ZIP): $(PY_SOURCES) $(SUBDIRS)
 	$(PYTHON) $(PYFLAGS) setup.py sdist --formats zip
 
-$(DIST_EGG): $(PY_SOURCES) $(SUBDIRS)
-	$(PYTHON) $(PYFLAGS) setup.py bdist_egg
+$(DIST_WHEEL): $(PY_SOURCES) $(SUBDIRS)
+	$(PYTHON) $(PYFLAGS) setup.py bdist_wheel --universal
 
 $(DIST_DEB): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES)
 	# build the binary package in the parent directory then rename it to
@@ -161,16 +160,14 @@ changelog: $(PY_SOURCES) $(DOC_SOURCES) $(DEB_SOURCES)
 	# commit the changes and add a new tag
 	git commit debian/changelog -m "Updated changelog for release $(VER)"
 
-release: $(PY_SOURCES) $(DOC_SOURCES) $(DIST_DEB) $(DIST_DSC)
+release: $(DIST_DEB) $(DIST_DSC) $(DIST_TAR) $(DIST_WHEEL)
 	git tag -s v$(VER) -m "Release v$(VER)"
 	git push --tags
-	# update the package's registration on PyPI (in case any metadata's changed)
-	$(PYTHON) $(PYFLAGS) setup.py register -r https://pypi.python.org/pypi
 	# build a source archive and upload to PyPI
-	$(PYTHON) $(PYFLAGS) setup.py sdist upload -r https://pypi.python.org/pypi
+	$(TWINE) upload $(DIST_TAR) $(DIST_WHEEL)
 	# build the deb source archive and upload to Raspbian
 	dput raspberrypi dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes
 	dput raspberrypi dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).changes
 
-.PHONY: all install develop test doc source egg zip tar deb dist clean tags release upload $(SUBDIRS)
+.PHONY: all install develop test doc source egg wheel zip tar deb dist clean tags release upload $(SUBDIRS)
 

debian/clean

@@ -1,4 +1,3 @@
-tags
 dist/
 build/
 .pybuild/