Merge lp:~stub/codetree/nopy2 into lp:codetree

[Stuart Bishop]

Drop Python2 support

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~stub/codetree/nopy2]

119. By Stuart Bishop on 2020-06-10

Fix clean build rule under trusty

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 119

=== modified file 'Makefile'
--- Makefile	2020-04-20 06:38:12 +0000
+++ Makefile	2020-06-10 10:48:33 +0000
@@ -1,8 +1,8 @@
 userinstall:
-	python setup.py install --user
+	python3 setup.py install --user
 
 install:
-	python setup.py install
+	python3 setup.py install
 
 clean:
 	rm -rf build codetree.egg-info dist
@@ -18,10 +18,10 @@
 	nosetests3 tests/
 
 dist:
-	bzr export --root=. ../codetree_$$(python setup.py --version).orig.tar.bz2 .
+	bzr export --root=. ../codetree_$$(python3 setup.py --version).orig.tar.bz2 .
 
 dch:
-	dch -D trusty --newversion $$(python setup.py -V)-1
+	dch -D trusty --newversion $$(python3 setup.py -V)-1
 
 deb: dist dch
 	cd debian && debuild -sa -I.bzr

=== modified file 'debian/changelog'
--- debian/changelog	2020-05-05 06:22:21 +0000
+++ debian/changelog	2020-06-10 10:48:33 +0000
@@ -1,3 +1,9 @@
+codetree (1.2.0-0) trusty; urgency=medium
+
+  * Drop python2 support
+
+ -- Stuart Bishop (Work) <[e-mail]>  Wed, 10 Jun 2020 20:20:19 +1000
+
 codetree (1.1.1-0) trusty; urgency=medium
 
   * Ensure git branches stick over multiple runs

=== modified file 'debian/control'
--- debian/control	2020-04-21 08:09:52 +0000
+++ debian/control	2020-06-10 10:48:33 +0000
@@ -3,21 +3,17 @@
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 7.4.3), dh-python,
- python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), python-nose, python-mock,
  python3-setuptools, python3-all, python3-nose, python3-flake8, python3-mock,
- python-requests, python-yaml, python-concurrent.futures, git, rsync, unzip, bzr, python3-requests, python3-yaml,
+ git, rsync, unzip, bzr, python3-requests, python3-yaml,
 Standards-Version: 3.9.1
 
-Package: python-codetree
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
- python-requests, python-yaml, python-concurrent.futures, git, rsync, unzip, bzr, python3-codetree
-Description: A code tree builder
-
 # NB. This package contains the codetree executable, but is not called
 # 'codetree' because there is already an Ubuntu package with that name
 # for a different tool.
 Package: python3-codetree
+Provides: python-codetree (= 1.2.0-0)
+Replaces: python-codetree (<< 1.2.0-0)
+Breaks: python-codetree (<< 1.0)
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}, python3-requests, python3-yaml, git, rsync, unzip, bzr
 Description: A code tree builder

=== modified file 'debian/rules'
--- debian/rules	2020-04-22 02:23:53 +0000
+++ debian/rules	2020-06-10 10:48:33 +0000
@@ -4,19 +4,17 @@
 export LC_ALL=C
  
 %:
-	dh $@ --buildsystem=python_distutils --with=`dh --list | grep -e "python[2-3]\?$$" | paste -d, -s -`
+	dh $@ --buildsystem=python_distutils --with=python3
 
-override_dh_auto_test:
-	echo Tests disabled in package builds due to cross version problems
+# override_dh_auto_test:
+# echo Tests disabled in package builds due to cross version problems
 
 override_dh_auto_clean:
-	dh_auto_clean
+	python3 setup.py clean -a
 	rm -rf build
 
 override_dh_auto_build:
-	python2 setup.py build
 	python3 setup.py build
 
 override_dh_auto_install:
-	python2 setup.py install --root=$(CURDIR)/debian/$(DEB_SOURCE) --install-layout=deb  # writes usr/bin/codetree
-	python3 setup.py install --root=$(CURDIR)/debian/$(DEB_SOURCE) --install-layout=deb  # rewrites usr/bin/codetree
+	python3 setup.py install --root=$(CURDIR)/debian/$(DEB_SOURCE) --install-layout=deb

=== modified file 'setup.py'
--- setup.py	2020-05-05 06:22:21 +0000
+++ setup.py	2020-06-10 10:48:33 +0000
@@ -1,4 +1,3 @@
-from __future__ import division, print_function
 from setuptools import setup, find_packages
 import sys
 
@@ -18,10 +17,6 @@
     # 'six',  six now embedded as codetree.six
 ]
 
-if sys.version_info.major == 2:
-    tests_requires.extend(['futures>=3.1.1', 'mock>=2.0'])
-    install_requires.extend(['futures'])
-
 setup(
     name="python-codetree",
     version="1.1.1",