Drop python2 support; Closes: #936454

debian/changelog

@@ -1,3 +1,10 @@
+dulwich (0.19.14-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Drop python2 support; Closes: #936454
+
+ -- Sandro Tosi <morph@debian.org>  Mon, 23 Dec 2019 17:51:45 -0500
+
 dulwich (0.19.14-2) unstable; urgency=medium
 
   * Cherry-pick upstream change for cleaning up file modes when

debian/control

@@ -8,11 +8,6 @@ Build-Depends: debhelper-compat (= 12),
                dh-python,
                git (>= 1:1.7.0.4-2) [!alpha !ppc64 !sparc64 !x32 !ia64],
                pypy-dev [alpha amd64 arm64 armel armhf i386 mips powerpc ppc64el s390x],
-               python-all-dbg (>= 2.6.6-3),
-               python-all-dev (>= 2.6.6-3),
-               python-certifi,
-               python-unittest2,
-               python-urllib3 (>= 1.24.1),
                python3-all-dbg,
                python3-all-dev,
                python3-certifi,
@@ -22,27 +17,6 @@ Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/python-team/modules/dulwich.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/dulwich
 
-Package: python-dulwich
-Architecture: any
-Depends: python-certifi,
-         python-urllib3 (>= 1.24.1),
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends}
-Breaks: bzr-git (<< 0.6.13+bzr1650), python-breezy (<< 3.0.0~bzr7268)
-Suggests: python-gpg
-Description: Python Git library
- Dulwich is a Python implementation of the file formats and protocols
- used by the Git version control system. It can currently read from and write
- to existing Git repositories and implements the protocol for pushing and
- receiving packs from remote servers.
- .
- All functionality is available in pure Python, but for improved performance
- replacements of some modules written in C are also available. This package
- includes the high performance versions.
- .
- This package contains the module built for Python version 2.x.
-
 Package: pypy-dulwich
 Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x
 Provides: ${pypy:Provides}

debian/python-dulwich.examples

@@ -1 +0,0 @@
-examples/*

debian/python-dulwich.lintian-overrides

@@ -1,2 +0,0 @@
-python-dulwich binary: package-contains-vcs-control-file
-python-dulwich binary: executable-not-elf-or-script usr/lib/python2.7/dist-packages/dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310

debian/rules

@@ -9,7 +9,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
 pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib_d.*-$(1) 2>/dev/null || ls -d $(CURDIR)/build/lib.*$(1)-pydebug)
 
-pyflavours = python2,python3$(shell which pypy >/dev/null && echo -n ,pypy)
+pyflavours = python3$(shell which pypy >/dev/null && echo -n ,pypy)
 
 %:
 	dh $* --with $(pyflavours) --buildsystem=pybuild
@@ -24,7 +24,6 @@ override_dh_auto_clean:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) check PYTHON=python
 	$(MAKE) check PYTHON=python3
 ifneq (,$(findstring pypy,$(pyflavours)))
 	$(MAKE) check PYTHON=pypy
@@ -41,7 +40,6 @@ ifneq (,$(findstring pypy,$(pyflavours)))
 	rm -rf debian/tmp/usr/lib/pypy/bin
 endif
 	# Install everything excluding the *_d.so debug extensions to python-dulwich and python3-dulwich
-	dh_install -p python-dulwich -X"*_d.so" -Xpypy "debian/tmp/usr/lib/python2*/*-packages"
 	dh_install -p python3-dulwich -X"*_d.so" -Xpypy "debian/tmp/usr/lib/python3*/*-packages"
 ifneq (,$(findstring pypy,$(pyflavours)))
 	# Install the pypy files to pypy-dulwich
@@ -49,14 +47,12 @@ ifneq (,$(findstring pypy,$(pyflavours)))
 endif
 
 override_dh_installdocs:
-	dh_installdocs -ppython-dulwich docs/tutorial -X.gitignore -XMakefile
 	dh_installdocs -ppython3-dulwich docs/tutorial -X.gitignore -XMakefile
 ifneq (,$(findstring pypy,$(pyflavours)))
 	dh_installdocs -ppypy-dulwich docs/tutorial -X.gitignore -XMakefile
 endif
 
 override_dh_strip:
-	dh_strip -p python-dulwich --dbgsym-migration='python-dulwich-dbg (<< 0.16.4-1)'
 	dh_strip -p python3-dulwich --dbgsym-migration='python3-dulwich-dbg (<< 0.16.4-1)'
 ifneq (,$(findstring pypy,$(pyflavours)))
 	dh_strip -p pypy-dulwich

debian/tests/control

@@ -1,7 +1,3 @@
-Tests: testsuite2
-Depends: python-dulwich, git
-Restrictions: allow-stderr
-
 Tests: testsuite3
 Depends: python3-dulwich, git
 Restrictions: allow-stderr

debian/tests/testsuite2

@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-python -m unittest dulwich.tests.test_suite