Merge lp:~cjwatson/meta-lp-deps/remove-py2 into lp:meta-lp-deps

Proposed by Colin Watson
Status: Merged
Merged at revision: 214
Proposed branch: lp:~cjwatson/meta-lp-deps/remove-py2
Merge into: lp:meta-lp-deps
Diff against target: 65 lines (+13/-13)
2 files modified
debian/changelog (+1/-0)
debian/control (+12/-13)
To merge this branch: bzr merge lp:~cjwatson/meta-lp-deps/remove-py2
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+407607@code.launchpad.net

Commit message

Remove Python 2 dependencies.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

🎉🎉

Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2021-08-24 10:16:18 +0000
3+++ debian/changelog 2021-08-24 11:04:58 +0000
4@@ -2,6 +2,7 @@
5
6 * Remove dependency on python-pocket-lint, superseded by various
7 pre-commit linters.
8+ * Remove Python 2 dependencies.
9
10 -- Colin Watson <cjwatson@ubuntu.com> Tue, 24 Aug 2021 11:15:40 +0100
11
12
13=== modified file 'debian/control'
14--- debian/control 2021-08-24 10:16:18 +0000
15+++ debian/control 2021-08-24 11:04:58 +0000
16@@ -8,27 +8,26 @@
17 Package: launchpad-dependencies
18 Architecture: all
19 Depends: bzr, git,
20- python-dev, python3-dev,
21+ python3-dev,
22 gettext, libgettextpo-dev, build-essential,
23- python-apt (>= 0.8.0ubuntu1), python3-apt,
24- python-geoip, libmaxminddb-dev,
25+ python3-apt,
26+ libmaxminddb-dev,
27 gnupg1 | gnupg (<< 2.1.11-7+exp1), libgpgme11-dev (>= 1.1.0), cvs, subversion,
28- python-sqlite, ubuntu-keyring,
29- python-pil, python3-pil,
30+ ubuntu-keyring,
31+ python3-pil,
32 bison, graphviz,
33 libxml2-utils, patchutils,
34 openssh-client (>= 1:4.7p1-8ubuntu1.1), xsltproc,
35 geoip-data | geoip-data-city-lite,
36- python-subunit (>= 0.0.4),
37- python-pysqlite2, zlib1g-dev,
38- ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
39+ zlib1g-dev,
40+ ca-certificates, libapr1-dev, libsvn-dev,
41 openssh-client,
42 libpq-dev, unzip, lzma,
43- python-convoy, python3-convoy,
44- virtualenv | python-virtualenv (<< 1.11.6),
45+ python3-convoy,
46+ virtualenv,
47 libsodium-dev, libffi-dev, libssl-dev,
48 libxml2-dev, libxslt1-dev,
49- python-tdb, python3-tdb,
50+ python3-tdb,
51 ${misc:Depends}
52 Recommends: launchpad-database-dependencies (= ${source:Version})
53 Suggests:
54@@ -64,9 +63,9 @@
55 gir1.2-gtk-3.0,
56 gir1.2-webkit-3.0,
57 ${misc:Depends}
58-Recommends: pyflakes, subunit, python-boto, bzr-lpreview-body,
59+Recommends: pyflakes, subunit, bzr-lpreview-body,
60 postgresql-doc-9.3
61-Suggests: apache2, python-pydoctor, libapache2-mod-wsgi
62+Suggests: apache2, libapache2-mod-wsgi
63 Description: Metapackage for development dependencies of Launchpad
64 This metapackage depends on all of the packages required to do development
65 for the Launchpad application.

Subscribers

People subscribed via source and target branches