Drop python2 support; Closes: #937937

debian/changelog

 python-nacl (1.3.0-4) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Mark python-nacl-doc as Multi-Arch: foreign.
 
- -- Colin Watson <cjwatson@debian.org>  Sat, 14 Dec 2019 02:51:21 +0000
+  [ Sandro Tosi ]
+  * Drop python2 support; Closes: #937937
+
+ -- Sandro Tosi <morph@debian.org>  Thu, 09 Jan 2020 22:42:13 -0500
 
 python-nacl (1.3.0-3) unstable; urgency=medium
 

debian/control

@@ -8,12 +8,6 @@ Build-Depends:
  debhelper-compat (= 9),
  dh-python,
  libsodium-dev (>= 1.0.16),
- python-all-dev,
- python-cffi (>= 1.0.0),
- python-hypothesis (>= 4.36.2),
- python-pytest,
- python-setuptools,
- python-six,
  python3-all-dev,
  python3-cffi (>= 1.0.0),
  python3-hypothesis (>= 4.36.2),
@@ -26,17 +20,6 @@ Homepage: https://github.com/pyca/pynacl/
 Vcs-Git: https://salsa.debian.org/python-team/modules/python-nacl.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/python-nacl
 
-Package: python-nacl
-Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Suggests: python-nacl-doc
-Description: Python bindings to libsodium (Python 2)
- PyNaCl is a Python binding to the Networking and Cryptography library (in the
- form of libsodium), a crypto library with the stated goal of improving
- usability, security and speed.
- .
- This package contains the Python 2 version of pynacl.
-
 Package: python3-nacl
 Architecture: any
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}

debian/rules

@@ -6,6 +6,8 @@ export PYBUILD_NAME=nacl
 export PYBUILD_TEST_PYTEST=1
 export PYBUILD_TEST_ARGS={dir}/tests/
 
+export PY3DEFAULT=$(shell py3versions -d)
+
 export PYTHONDONTWRITEBYTECODE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
@@ -16,7 +18,7 @@ export SODIUM_INSTALL=system
 
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 
 override_dh_clean:
@@ -33,7 +35,7 @@ override_dh_auto_clean:
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=debian/python-nacl/usr/lib/python2.7/dist-packages http_proxy='127.0.0.1:9' python3 -m sphinx -N -bhtml docs debian/python-nacl-doc/usr/share/doc/python-nacl-doc/html
+	PYTHONPATH=debian/python3-nacl/usr/lib/$(PY3DEFAULT)/dist-packages http_proxy='127.0.0.1:9' python3 -m sphinx -N -bhtml docs debian/python-nacl-doc/usr/share/doc/python-nacl-doc/html
 	dh_sphinxdoc
 endif
 

debian/tests/control

-Tests: python2 python3
+Tests: python3
 Depends: @, @builddeps@
 Restrictions: needs-root

debian/tests/python2

-#!/bin/bash
-set -e
-SRC="${PWD}"
-
-cd "${AUTOPKGTEST_TMP}"
-for py in $(pyversions -vi) ; do
-  python$py -m pytest ${SRC}/tests
-done