diff --git a/debian/changelog b/debian/changelog
index 8a65dba..a463271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+python-lockfile (1:0.12.2-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix autopkgtest to work reliably with multiple supported python3 versions
+ (Closes: #954205)
+
+ -- Scott Kitterman <scott@kitterman.com> Wed, 18 Mar 2020 09:13:51 -0400
+
+python-lockfile (1:0.12.2-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support; Closes: #937897, #939930
+
+ -- Sandro Tosi <morph@debian.org> Fri, 13 Mar 2020 19:12:13 -0400
+
python-lockfile (1:0.12.2-2) unstable; urgency=medium
* The “Tuğçe Albayrak” release.
diff --git a/debian/control b/debian/control
index 5e6aa07..2ba43cd 100644
--- a/debian/control
+++ b/debian/control
@@ -11,42 +11,9 @@ Build-Depends:
python3-nose,
python3-sphinx,
python3-all,
- python-setuptools,
- python-pbr (>= 1.8),
- python-nose,
- python-all
Standards-Version: 3.9.8
VCS-Git: https://notabug.org/bignose/debian_python-lockfile.git
VCS-Browser: https://notabug.org/bignose/debian_python-lockfile/
-X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.2
-
-Package: python-lockfile
-Architecture: all
-Depends:
- ${python:Depends},
- ${misc:Depends}
-Suggests: python-lockfile-doc
-Description: file locking library for Python — Python 2 library
- The ‘lockfile’ library exports a ‘LockFile’ class which provides a
- simple API for locking files.
- .
- The appropriate implementation for ‘LockFile’ is chosen automatically
- based on the OS capabilities for an atomic filesystem operation.
- These implementations are also available for explicit use as
- ‘LinkLockFile’ and ‘MkdirLockFile’.
- .
- Other back ends are possible with the same semantics. Examples
- included are:
- * ‘SQLiteLockFile’, using records in an SQLite database.
- * ‘PIDLockFile’, using the semantics of a Unix PID file.
- .
- Unlike other Python locking libraries (the Windows ‘msvcrt.locking’
- function, the Unix ‘fcntl.flock’, ‘fcntl.lockf’, and the deprecated
- ‘posixfile’ module), the API is identical across both Unix (including
- GNU/Linux and MacOS) and Windows platforms.
- .
- This package installs the Python 2 library.
Package: python3-lockfile
Architecture: all
@@ -81,7 +48,7 @@ Architecture: all
Depends:
${sphinxdoc:Depends},
${misc:Depends}
-Recommends: python-lockfile
+Recommends: python3-lockfile
Description: file locking library for Python — documentation
The ‘lockfile’ library exports a ‘LockFile’ class which provides a
simple API for locking files.
diff --git a/debian/python-lockfile.docs b/debian/python-lockfile.docs
deleted file mode 100644
index 9a815bb..0000000
--- a/debian/python-lockfile.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README.rst
-ACKS
-AUTHORS
diff --git a/debian/rules b/debian/rules
index e7fc05e..e2e9023 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ SPHINX = sphinx-build
SPHINX_OPTS = -N
%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+ dh $@ --with python3,sphinxdoc --buildsystem=pybuild
.PHONY: get-packaged-orig-source
diff --git a/debian/tests/control b/debian/tests/control
index 811e6c6..ff0440c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,13 +2,9 @@
# Control file for Debian ‘autopkgtests’.
# Documentation: ‘/usr/share/doc/autopkgtest/README.package-tests.rst.gz’
-Tests: smoke-python2
-Depends:
- python-pkg-resources,
- python-lockfile
-
Tests: smoke-python3
Depends:
+ python3-all,
python3-pkg-resources,
python3-lockfile
diff --git a/debian/tests/smoke-python2 b/debian/tests/smoke-python2
deleted file mode 100755
index 0af4aa3..0000000
--- a/debian/tests/smoke-python2
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/bash
-#
-# debian/tests/smoke-python2
-# Part of Debian ‘python-lockfile’ package.
-#
-# Copyright © 2016 Ben Finney <bignose@debian.org>
-# This is free software; you may copy, modify, and/or distribute this work
-# under the terms of the GNU General Public License, version 3 or later.
-# No warranty expressed or implied.
-# See the file ‘/usr/share/common-licenses/GPL-3’ for details.
-#
-# Smoke test for package in Python 2 environments.
-
-set -o errexit
-set -o errtrace
-set -o nounset
-
-DISTRIBUTION_NAME=lockfile
-MODULE_NAMES=(
- lockfile
- )
-
-program_dir="$(dirname "$(realpath --strip "$0")")"
-
-# Use a working directory away from the source package root,
-# so that Python imports will not find the local source package.
-working_dir="$program_dir"
-cd "$working_dir"
-
-test_opts="--distribution=$DISTRIBUTION_NAME"
-for mod in ${MODULE_NAMES[@]} ; do
- # Accumulate the module names.
- test_opts="$test_opts --module=$mod"
-done
-
-for py in $(pyversions -i) ; do
- printf "Python command: %s\n" $py
- $py "$program_dir"/smoke_test.py $test_opts
- printf "\n"
-done
-
-
-# Local variables:
-# coding: utf-8
-# mode: shell-script
-# End:
-# vim: fileencoding=utf-8 filetype=sh :
diff --git a/debian/tests/smoke-python3 b/debian/tests/smoke-python3
index 15ca7c3..058b424 100755
--- a/debian/tests/smoke-python3
+++ b/debian/tests/smoke-python3
@@ -33,7 +33,7 @@ for mod in ${MODULE_NAMES[@]} ; do
test_opts="$test_opts --module=$mod"
done
-for py in $(py3versions -i) ; do
+for py in $(py3versions -s) ; do
printf "Python command: %s\n" $py
$py "$program_dir"/smoke_test.py $test_opts
printf "\n"
