launchpad-reviewers team mailing list archive

[Colin Watson <mp+428617@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:loggerhead-2.0.0 into launchpad:master.

Commit message:
Install loggerhead using pip

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

loggerhead 2.0.0 finally has the right packaging metadata to allow us to install it using pip rather than using the deprecated sourcedeps mechanism.

I also had to upgrade to Paste 3.5.2 to fix a Python 3 compatibility issue with loggerhead's WSGI application for static files that I noticed while testing this locally; and we no longer need SimpleTAL at all, since loggerhead 2.0.0 uses Chameleon instead.

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

diff --git a/doc/explanation/pip.rst b/doc/explanation/pip.rst
index 308aefe..e8e9c0c 100644
--- a/doc/explanation/pip.rst
+++ b/doc/explanation/pip.rst
@@ -277,6 +277,7 @@ confusion across build environments will happen.
 
 .. _`requirements specifiers`: https://pip.pypa.io/en/stable/reference/pip_install/#requirement-specifiers
 
+.. _upgrade-package:
 
 Upgrade a Package
 =================
diff --git a/doc/how-to/land-update-for-loggerhead.rst b/doc/how-to/land-update-for-loggerhead.rst
index 92b5fbf..135e086 100644
--- a/doc/how-to/land-update-for-loggerhead.rst
+++ b/doc/how-to/land-update-for-loggerhead.rst
@@ -14,11 +14,8 @@ Landing changes for Loggerhead itself
 Landing changes in Launchpad itself
 -----------------------------------
 
-- update the revision number in ``utilities/sourcedeps.conf``
-- run ``utilities/update-sourcecode``
-- make sure ``utilities/sourcedeps.cache`` was updated
-- propose changes as merge proposal
-- mark merge proposal as **Approved**
+- ask somebody with PyPI access to make a loggerhead release
+- see :ref:`Upgrade a Package <upgrade-package>`
 
 Performing QA
 -------------
diff --git a/lib/loggerhead b/lib/loggerhead
deleted file mode 120000
index 93b3c71..0000000
--- a/lib/loggerhead
+++ /dev/null
@@ -1 +0,0 @@
-../sourcecode/loggerhead/loggerhead
\ No newline at end of file
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 2bb8090..b1ae70d 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -81,6 +81,7 @@ lazr.restful==2.0.1
 lazr.restfulclient==0.14.4
 lazr.sshserver==0.1.13
 lazr.uri==1.0.6
+loggerhead==2.0.0
 lpjsmin==0.6
 m2r==0.1.13
 Markdown==3.2.2
@@ -108,7 +109,7 @@ oslo.i18n==3.25.1
 oslo.serialization==2.29.3
 oslo.utils==3.42.1
 paramiko==2.4.1
-Paste==3.3.0
+Paste==3.5.2
 PasteDeploy==2.1.0
 pathlib2==2.3.2
 patiencediff==0.2.2
@@ -155,7 +156,6 @@ setproctitle==1.1.7
 setuptools-git==1.2
 setuptools-scm==3.4.3
 simplejson==3.8.2
-SimpleTAL==5.2
 soupmatchers==0.4
 soupsieve==1.9
 statsd==3.3.0
diff --git a/setup.cfg b/setup.cfg
index 806401a..c0aa6b4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -53,6 +53,7 @@ install_requires =
     lazr.restful
     lazr.sshserver
     lazr.uri
+    loggerhead[proxied]
     lpjsmin
     lxml[cssselect]
     Markdown
@@ -159,11 +160,6 @@ install_requires =
     zope.traversing
     zope.vocabularyregistry
     zstandard
-    # Loggerhead dependencies. These should be removed once bug 383360 is
-    # fixed and we include it as a source dist.
-    Paste
-    PasteDeploy
-    SimpleTAL
 include_package_data = True
 package_dir = =lib
 zip_safe = False
diff --git a/sourcecode/.gitignore b/sourcecode/.gitignore
index ef0a7b8..4210d2d 100644
--- a/sourcecode/.gitignore
+++ b/sourcecode/.gitignore
@@ -1,4 +1,2 @@
 brz-builder
 brz-loom
-difftacular
-loggerhead
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index 667a3c6..12eb987 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -6,9 +6,5 @@
     "brz-loom": [
         167,
         "jelmer@xxxxxxxxx-20200530172546-539m8h6nngu17ydi"
-    ],
-    "loggerhead": [
-        524,
-        "otto-copilot@xxxxxxxxxxxxx-20220711132320-7rtwbh42245yfkba"
     ]
 }
\ No newline at end of file
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index c771089..f11b16b 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -9,4 +9,3 @@
 
 brz-builder lp:~jelmer/brz-builder/trunk;revno=183
 brz-loom lp:~jelmer/brz-loom/trunk;revno=167
-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=524