[Python-modules-team] Bug#932985: Please remove Python 2 support

[Thomas Goirand]

Source: django-session-security
Version: 2.6.5+dfsg-1
Severity: serious
Tags: patch

Hi,

Please remove Python 2 support. Attached patch may help.

Thomas
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 50bbfe1..e9b3fe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-django-session-security (2.6.5+dfsg-2) UNRELEASED; urgency=medium
+django-session-security (2.6.5+dfsg-2) unstable; urgency=medium
 
+  [ Ondřej Nový ]
   * Use debhelper-compat instead of debian/compat.
   * Bump Standards-Version to 4.4.0.
 
+  [ Thomas Goirand ]
+  * Team upload.
+  * Removed Python 2 support.
+  * Correctly overrides override_dh_sphinxdoc rather than auto_build.
+  * Add missing (build-)depends python3-six.
+
  -- Ondřej Nový <onovy at debian.org>  Sat, 20 Jul 2019 00:30:59 +0200
 
 django-session-security (2.6.5+dfsg-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 7542d93..fab6569 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: python
 Priority: optional
 Build-Depends: debhelper-compat (= 9),
  dh-python,
- python-all,
- python-setuptools,
  python3-all,
  python3-setuptools,
+ python3-six,
  python3-django,
  python3-sphinx
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
@@ -16,23 +15,10 @@ Vcs-Git: https://salsa.debian.org/python-team/modules/django-session-security.gi
 Standards-Version: 4.4.0
 Homepage: http://django-session-security.rtfd.org/
 
-Package: python-django-session-security
-Architecture: all
-Depends: ${python:Depends},
-         ${misc:Depends},
-         ${sphinxdoc:Depends}
-Recommends: libjs-jquery
-Description: Python2 Django module to log a user out after X minutes
- A little javascript and middleware work together to ensure that the
- user was active during the past X minutes in any tab he has open.
- Otherwise, display a warning leaving a couple of minutes to show any
- kind of activity like moving the mouse. Otherwise, logout the user.
- .
- This is the Python 2 version.
-
 Package: python3-django-session-security
 Architecture: all
-Depends: ${python3:Depends},
+Depends: python3-six,
+         ${python3:Depends},
          ${misc:Depends},
          ${sphinxdoc:Depends}
 Recommends: libjs-jquery
diff --git a/debian/python-django-session-security.install b/debian/python-django-session-security.install
deleted file mode 100644
index dbdb301..0000000
--- a/debian/python-django-session-security.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/python2*
diff --git a/debian/python-django-session-security.links b/debian/python-django-session-security.links
deleted file mode 100644
index 67da37a..0000000
--- a/debian/python-django-session-security.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/lib/python2.7/dist-packages/session_security/tests/project/static/jquery.js
diff --git a/debian/rules b/debian/rules
index a655966..3842756 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 #DH_VERBOSE=1
 %:
-	dh "$@" --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh "$@" --with python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build -O--buildsystem=python_distutils
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
 	python3 setup.py build_sphinx
+	dh_sphinxdoc
+endif