launchpad-reviewers team mailing list archive

[Colin Watson <mp+431653@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:launchpadlib-1.10.17 into launchpad:master.

Commit message:
Upgrade to launchpadlib 1.10.17 and lazr.restfulclient 0.14.5

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/431653

This allows running launchpadlib's doctests as part of our test suite again (they need Launchpad as a test fixture).

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/431652
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:launchpadlib-1.10.17 into launchpad:master.

diff --git a/lib/lp/tests/test_opensource.py b/lib/lp/tests/test_opensource.py
index 69a29d1..d505809 100644
--- a/lib/lp/tests/test_opensource.py
+++ b/lib/lp/tests/test_opensource.py
@@ -38,9 +38,7 @@ def add_testable_opensource_package(suite, package):
     doctest_files = {}
     for docsdir in packages:
         for filename in os.listdir(os.path.join(topdir, docsdir)):
-            # XXX cjwatson 2022-06-20: This should be '.rst', but
-            # launchpadlib's doctests don't work with Python 3 yet.
-            if os.path.splitext(filename)[1] == ".txt":
+            if os.path.splitext(filename)[1] == ".rst":
                 doctest_files[filename] = os.path.join(docsdir, filename)
     # Sort the tests.
     for filename in sorted(doctest_files):
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 3f92fef..f1efa07 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -71,7 +71,7 @@ keyring==0.6.2
 keystoneauth1==4.1.0
 kombu==4.6.11
 launchpad-buildd==206
-launchpadlib==1.10.14
+launchpadlib==1.10.17
 lazr.batchnavigator==1.3.1
 lazr.config==2.2.3
 lazr.delegates==2.0.4
@@ -79,7 +79,7 @@ lazr.enum==1.2.1
 lazr.jobrunner==0.17
 lazr.lifecycle==1.2.1
 lazr.restful==2.0.1
-lazr.restfulclient==0.14.4
+lazr.restfulclient==0.14.5
 lazr.sshserver==0.1.13
 lazr.uri==1.0.6
 loggerhead==2.0.1