Commit 4226867a authored by Julian Andres Klode's avatar Julian Andres Klode
Browse files

Merge branch 'pu/drop-python2' into 'master'

Stop building for Python 2

See merge request apt-team/python-apt!48
parents 3b3d3c51 ca3aca5a
......@@ -11,10 +11,6 @@ Build-Depends: apt (>= 1.0.9.4),
dh-python,
fakeroot,
libapt-pkg-dev (>= 1.9.11~),
python-all (>= 2.7),
python-all-dev (>= 2.7),
python-all-dbg,
python-setuptools,
python3-all (>= 3.3),
python3-all-dev (>= 3.3),
python3-all-dbg (>= 3.3),
......@@ -29,55 +25,6 @@ Build-Depends: apt (>= 1.0.9.4),
Vcs-Git: https://salsa.debian.org/apt-team/python-apt.git
Vcs-Browser: https://salsa.debian.org/apt-team/python-apt
Package: python-apt
Architecture: any
Multi-Arch: allowed
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common,
gnupg, dirmngr | gnupg (<< 2),
Recommends: lsb-release, iso-codes, xz-utils
Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
computer-janitor (<< 1.14.1-1+),
debdelta (<< 0.41+),
python-dogtail (<< 0.6.1-3.1+),
python-software-properties (<< 0.70.debian-1+),
aptdaemon (<< 1.1.1+bzr982-0ubuntu31),
apt-forktracer (<< 0.3),
apt-listchanges (<< 2.85),
aptoncd (<< 0.1.98+bzr117),
apt-p2p (<< 0.1.6),
apt-xapian-index (<< 0.25),
bcfg2 (<< 1.0.1),
bzr-builddeb (<< 2.4),
debpartial-mirror (<< 0.2.98),
debsecan (<< 0.4.15),
gdebi (<< 0.6.1),
germinate (<< 1.21),
gnome-codec-install (<< 0.4.5),
mini-dinstall (<< 0.6.28),
python-cdd (<< 0.0.10),
rebuildd (<< 0.3.9),
software-center (<< 1.1.21debian2),
tla-buildpackage (<< 0.9.14),
ubuntu-dev-tools (<< 0.93debian1),
unattended-upgrades (<< 0.42debian2),
update-manager (<< 0.200.2-1),
update-notifier (<< 0.99.3debian9),
wajig (<< 2.0.46)
Provides: ${python:Provides}
Suggests: python-apt-dbg, python-apt-doc, apt
Description: Python interface to libapt-pkg
The apt_pkg Python interface will provide full access to the internal
libapt-pkg structures allowing Python programs to easily perform a
variety of functions, such as:
.
- Access to the APT configuration system
- Access to the APT package information database
- Parsing of Debian package control files, and other files with a
similar structure
.
The included 'aptsources' Python interface provides an abstraction of
the sources.list configuration on the repository and the distro level.
Package: python-apt-doc
Architecture: all
Section: doc
......@@ -91,25 +38,11 @@ Description: Python interface to libapt-pkg (API documentation)
.
This package contains the API documentation of python-apt.
Package: python-apt-dbg
Architecture: any
Multi-Arch: allowed
Section: debug
Depends: ${python:Depends}, python-apt (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: ${python:Provides}
Description: Python interface to libapt-pkg (debug extension)
The apt_pkg Python interface will provide full access to the internal
libapt-pkg structures allowing Python programs to easily perform a
variety of functions.
.
This package contains the extension built for the Python debug interpreter.
Package: python-apt-dev
Architecture: all
Depends: python-apt (>= ${source:Version}), libapt-pkg-dev (>= 0.7.10),
${misc:Depends}
Recommends: python-dev
Recommends: python3-dev
Description: Python interface to libapt-pkg (development files)
The apt_pkg Python interface will provide full access to the internal
libapt-pkg structures allowing Python programs to easily perform a
......
usr/lib/python2.*/*/*_d.so
......@@ -4,5 +4,5 @@ Abstract: API reference manual for Python bindings to libapt-pkg
Section: Programming/Python
Format: HTML
Index: /usr/share/doc/python-apt/html/index.html
Files: /usr/share/doc/python-apt/html/*
Index: /usr/share/doc/python-apt-doc/html/index.html
Files: /usr/share/doc/python-apt-doc/html/*
README.md
AUTHORS
TODO
data/templates/README.templates
usr/lib/python2.*/*/apt_pkg.so
usr/lib/python2.*/*/apt_inst.so
usr/lib/python2.*/*/*/
usr/lib/python2.*/*/*.egg-info
# it sets the location of the dpkg database when changing root
python-apt: uses-dpkg-database-directly usr/lib/python2.7/dist-packages/apt/cache.py
......@@ -13,7 +13,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
BUILDDIR3 := $(shell pybuild --print build_dir --interpreter python3)
%:
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
dh $@ --with python3,sphinxdoc --buildsystem=pybuild
override_dh_auto_build:
dh_auto_build
......@@ -24,13 +24,10 @@ override_dh_install:
dh_install
override_dh_installdocs:
dh_installdirs -ppython-apt-dev usr/share/doc/python-apt
dh_installdocs -p python-apt -p python-apt-dbg --link-doc=python-apt
dh_installdocs -p python3-apt -p python3-apt-dbg --link-doc=python3-apt
dh_installdocs --remaining-packages
override_dh_strip:
dh_strip -p python-apt --dbg-package=python-apt-dbg
dh_strip -p python3-apt --dbg-package=python3-apt-dbg
override_dh_compress:
......@@ -41,6 +38,3 @@ override_dh_auto_test: export PYBUILD_SYSTEM=custom
override_dh_auto_test: export PYBUILD_TEST_ARGS=env PYTHONPATH={build_dir} {interpreter} tests/test_all.py
override_dh_auto_test:
dh_auto_test || [ "$(DEB_BUILD_ARCH_OS)" = "hurd" ];
override_dh_python2:
dh_python2 -N python-apt-common
Tests: run-tests
Depends: @, apt-utils, python-all, python3-all, fakeroot, intltool, pycodestyle, pyflakes3, gnupg, dirmngr | gnupg (<< 2)
Depends: @, apt-utils, python3-all, fakeroot, intltool, pycodestyle, pyflakes3, gnupg, dirmngr | gnupg (<< 2)
......@@ -3,6 +3,6 @@
set -e
# from debian/rules
for python in $(pyversions -s; py3versions -s); do
for python in $(py3versions -s); do
$python tests/test_all.py -q
done
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment