Strip all the deb/dsc stuff out of Makefile

And migrate it to Python 3 only

Author: waveform80

Makefile

@@ -1,10 +1,9 @@
 # vim: set noet sw=4 ts=4 fileencoding=utf-8:
 
 # External utilities
-PYTHON=python
+PYTHON=python3
 PIP=pip
-PYTEST=py.test
-COVERAGE=coverage
+PYTEST=pytest
 TWINE=twine
 PYFLAGS=
 MSGINIT=msginit
@@ -14,56 +13,22 @@ XGETTEXT=xgettext
 GCS=glib-compile-schemas
 DEST_DIR=/
 
-# Horrid hack to ensure setuptools is installed in our python environment. This
-# is necessary with Python 3.3's venvs which don't install it by default.
-ifeq ($(shell python -c "import setuptools" 2>&1),)
-SETUPTOOLS:=
-else
-SETUPTOOLS:=$(shell wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | $(PYTHON))
-endif
-
 # Find the location of the GObject introspection libs and cairo (required for
 # the develop target)
-PYVER:=$(shell $(PYTHON) $(PYFLAGS) -c "import sys; print(sys.version_info[0])")
-ifeq ($(PYVER),3)
 RTIMULIB:=$(wildcard /usr/lib/python3/dist-packages/RTIMU.*)
 CAIRO:=$(wildcard /usr/lib/python3/dist-packages/cairo)
 GI:=$(wildcard /usr/lib/python3/dist-packages/gi)
 GOBJECT:=
 GLIB:=
-else
-RTIMULIB:=$(wildcard /usr/lib/python2.7/dist-packages/RTIMU.*)
-CAIRO:=$(wildcard /usr/lib/python2.7/dist-packages/cairo)
-GI:=$(wildcard /usr/lib/python2.7/dist-packages/gi)
-GOBJECT:=$(wildcard /usr/lib/python2.7/dist-packages/gobject)
-GLIB:=$(wildcard /usr/lib/python2.7/dist-packages/glib)
-endif
 
 # Calculate the base names of the distribution, the location of all source,
 # documentation, packaging, icon, and executable script files
 NAME:=$(shell $(PYTHON) $(PYFLAGS) setup.py --name)
-PKG_DIR:=$(subst -,_,$(NAME))
+WHEEL_NAME:=$(subst -,_,$(NAME))
 VER:=$(shell $(PYTHON) $(PYFLAGS) setup.py --version)
-DEB_ARCH:=$(shell dpkg --print-architecture)
-ifeq ($(shell lsb_release -si),Ubuntu)
-DEB_SUFFIX:=-1ubuntu1
-else
-DEB_SUFFIX:=
-endif
 PY_SOURCES:=$(shell \
 	$(PYTHON) $(PYFLAGS) setup.py egg_info >/dev/null 2>&1 && \
-	cat $(PKG_DIR).egg-info/SOURCES.txt | grep -v "\.egg-info"  | grep -v "\.mo$$")
-DEB_SOURCES:=debian/changelog \
-	debian/control \
-	debian/copyright \
-	debian/rules \
-	debian/docs \
-	$(wildcard debian/*.init) \
-	$(wildcard debian/*.default) \
-	$(wildcard debian/*.manpages) \
-	$(wildcard debian/*.docs) \
-	$(wildcard debian/*.doc-base) \
-	$(wildcard debian/*.desktop)
+	cat $(WHEEL_NAME).egg-info/SOURCES.txt | grep -v "\.egg-info"  | grep -v "\.mo$$")
 DOC_SOURCES:=docs/conf.py \
 	$(wildcard docs/*.png) \
 	$(wildcard docs/*.svg) \
@@ -75,27 +40,15 @@ DOC_SOURCES:=docs/conf.py \
 SUBDIRS:=icons
 
 # Calculate the name of all outputs
-DIST_WHEEL=dist/$(PKG_DIR)-$(VER)-py2.py3-none-any.whl
+DIST_WHEEL=dist/$(WHEEL_NAME)-$(VER)-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)-tools_$(VER)$(DEB_SUFFIX)_all.deb \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).build \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).buildinfo \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).changes
-DIST_DSC=dist/$(NAME)_$(VER)$(DEB_SUFFIX).tar.xz \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX).dsc \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.build \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.buildinfo \
-	dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes
 MAN_PAGES=man/sense_rec.1 man/sense_play.1 man/sense_csv.1 man/sense_emu_gui.1
-POT_FILE=$(PKG_DIR)/locale/$(NAME).pot
-PO_FILES:=$(wildcard $(PKG_DIR)/locale/*.po)
-MO_FILES:=$(patsubst $(PKG_DIR)/locale/%.po,$(PKG_DIR)/locale/%/LC_MESSAGES/$(NAME).mo,$(PO_FILES))
-GSCHEMA_FILES:=$(wildcard $(PKG_DIR)/*.gschema.xml)
-GSCHEMA_COMPILED=$(PKG_DIR)/gschemas.compiled
+POT_FILE=$(WHEEL_NAME)/locale/$(NAME).pot
+PO_FILES:=$(wildcard $(WHEEL_NAME)/locale/*.po)
+MO_FILES:=$(patsubst $(WHEEL_NAME)/locale/%.po,$(WHEEL_NAME)/locale/%/LC_MESSAGES/$(NAME).mo,$(PO_FILES))
+GSCHEMA_FILES:=$(wildcard $(WHEEL_NAME)/*.gschema.xml)
+GSCHEMA_COMPILED=$(WHEEL_NAME)/gschemas.compiled
 
 
 # Default target
@@ -107,10 +60,9 @@ all:
 	@echo "make test - Run tests"
 	@echo "make doc - Generate HTML and PDF documentation"
 	@echo "make source - Create source package"
-	@echo "make egg - Generate a PyPI egg package"
+	@echo "make wheel - Generate a PyPI wheel package"
 	@echo "make zip - Generate a source zip package"
 	@echo "make tar - Generate a source tar package"
-	@echo "make deb - Generate Debian packages"
 	@echo "make dist - Generate all packages"
 	@echo "make clean - Get rid of all generated files"
 	@echo "make release - Create and tag a new release"
@@ -133,9 +85,7 @@ zip: $(DIST_ZIP)
 
 tar: $(DIST_TAR)
 
-deb: $(DIST_DEB) $(DIST_DSC)
-
-dist: $(DIST_WHEEL) $(DIST_DEB) $(DIST_DSC) $(DIST_TAR) $(DIST_ZIP)
+dist: $(DIST_WHEEL) $(DIST_TAR) $(DIST_ZIP)
 
 i18n: $(MO_FILES) $(PO_FILES) $(POT_FILE)
 
@@ -175,19 +125,17 @@ endif
 endif
 
 test:
-	$(COVERAGE) run --rcfile coverage.cfg -m $(PYTEST) tests
-	$(COVERAGE) report --rcfile coverage.cfg
+	$(PYTEST)
 
 clean:
-	dh_clean
-	rm -fr dist/ $(NAME).egg-info/ tags
+	rm -fr dist/ build/ .pytest_cache/ .mypy_cache/ $(WHEEL_NAME).egg-info/ tags .coverage
 	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"
+	ctags -R --exclude="build/*" --exclude="docs/*" --languages="Python"
 
 $(SUBDIRS):
 	$(MAKE) -C $@
@@ -205,10 +153,10 @@ $(PO_FILES): $(POT_FILE)
 
 $(MO_FILES): $(PO_FILES)
 	mkdir -p $(dir $@)
-	$(MSGFMT) $(patsubst $(PKG_DIR)/locale/%/LC_MESSAGES/$(NAME).mo,$(PKG_DIR)/locale/%.po,$@) -o $@
+	$(MSGFMT) $(patsubst $(WHEEL_NAME)/locale/%/LC_MESSAGES/$(NAME).mo,$(WHEEL_NAME)/locale/%.po,$@) -o $@
 
 $(GSCHEMA_COMPILED): $(GSCHEMA_FILES)
-	$(GCS) $(PKG_DIR)
+	$(GCS) $(WHEEL_NAME)
 
 $(DIST_TAR): $(PY_SOURCES) $(MO_FILES) $(GSCHEMA_COMPILED) $(SUBDIRS)
 	$(PYTHON) $(PYFLAGS) setup.py sdist --formats gztar
@@ -217,46 +165,16 @@ $(DIST_ZIP): $(PY_SOURCES) $(MO_FILES) $(GSCHEMA_COMPILED) $(SUBDIRS)
 	$(PYTHON) $(PYFLAGS) setup.py sdist --formats zip
 
 $(DIST_WHEEL): $(PY_SOURCES) $(MO_FILES) $(GSCHEMA_COMPILED) $(SUBDIRS)
-	$(PYTHON) $(PYFLAGS) setup.py bdist_wheel --universal
-
-$(DIST_DEB): $(PY_SOURCES) $(MO_FILES) $(GSCHEMA_COMPILED) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES)
-	# build the binary package in the parent directory then rename it to
-	# project_version.orig.tar.gz
-	$(PYTHON) $(PYFLAGS) setup.py sdist --dist-dir=../
-	rename -f 's/$(NAME)-(.*)\.tar\.gz/$(NAME)_$$1\.orig\.tar\.gz/' ../*
-	debuild -b
-	mkdir -p dist/
-	for f in $(DIST_DEB); do cp ../$${f##*/} dist/; done
+	$(PYTHON) $(PYFLAGS) setup.py bdist_wheel
 
-$(DIST_DSC): $(PY_SOURCES) $(PO_FILES) $(GSCHEMA_COMPILED) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES)
-	# build the source package in the parent directory then rename it to
-	# project_version.orig.tar.gz
-	$(PYTHON) $(PYFLAGS) setup.py sdist --dist-dir=../
-	rename -f 's/$(NAME)-(.*)\.tar\.gz/$(NAME)_$$1\.orig\.tar\.gz/' ../*
-	debuild -S
-	mkdir -p dist/
-	for f in $(DIST_DSC); do cp ../$${f##*/} dist/; done
-
-changelog: $(PY_SOURCES) $(MO_FILES) $(GSCHEMA_COMPILED) $(DOC_SOURCES) $(DEB_SOURCES)
-	# ensure there are no current uncommitted changes
+release:
+	$(MAKE) clean
 	test -z "$(shell git status --porcelain)"
-	# update the debian changelog with new release information
-	dch --newversion $(VER)$(DEB_SUFFIX) --controlmaint
-	# commit the changes and add a new tag
-	git commit debian/changelog -m "Updated changelog for release $(VER)"
+	git tag -s v$(VER) -m "Release v$(VER)"
+	git push origin v$(VER)
 
-release-pi: $(DIST_TAR) $(DIST_WHEEL) $(DIST_DEB) $(DIST_DSC)
-	git tag -s v$(VER) -m "Release $(VER)"
-	git push --tags
-	# build a source archive and upload to PyPI
+upload: $(DIST_TAR) $(DIST_WHEEL)
+	$(TWINE) check $(DIST_TAR) $(DIST_WHEEL)
 	$(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
-
-release-ubuntu: $(DIST_DEB) $(DIST_DSC)
-	# build the deb source archive and upload to the PPA
-	dput waveform-ppa dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes
-
-.PHONY: all install develop test doc source wheel zip tar deb dist clean tags changelog release-pi release-ubuntu $(SUBDIRS)
 
+.PHONY: all install develop test doc source wheel zip tar dist clean tags release upload $(SUBDIRS)