launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:pygettextpo-0.2 into launchpad:master.

Commit message:
Upgrade to pygettextpo 0.2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1016333 in Launchpad itself: "pygettextpo is in sourcecode"
  https://bugs.launchpad.net/launchpad/+bug/1016333

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

We now consume this from a proper sdist rather than from the sourcecode directory.

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

diff --git a/Makefile b/Makefile
index f35bd18..1b84b8d 100644
--- a/Makefile
+++ b/Makefile
@@ -421,9 +421,6 @@ lxc-clean: clean_js clean_pip clean_logs
 	# it does everything expected from a clean target.  When the
 	# referenced bug is fixed, this target may be reunited with
 	# the 'clean' target.
-	if test -f sourcecode/pygettextpo/Makefile; then \
-		$(MAKE) -C sourcecode/pygettextpo clean; \
-	fi
 	$(RM) -r env wheelhouse
 	$(RM) -r $(LP_BUILT_JS_ROOT)/*
 	$(RM) -r $(CODEHOSTING_ROOT)/*
diff --git a/constraints.txt b/constraints.txt
index 0bebad0..ecd2069 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -265,6 +265,7 @@ psutil==5.4.2
 psycopg2==2.7.4
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
+pygettextpo==0.2
 # lp:~launchpad/pygpgme/pthread
 # lp1 Link against libgpgme-pthread for thread-safety.
 pygpgme==0.3+lp1
diff --git a/lib/gettextpo.so b/lib/gettextpo.so
deleted file mode 120000
index 7c10a32..0000000
--- a/lib/gettextpo.so
+++ /dev/null
@@ -1 +0,0 @@
-../sourcecode/pygettextpo/gettextpo.so
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0f15f7f..e88b299 100644
--- a/setup.py
+++ b/setup.py
@@ -208,6 +208,7 @@ setup(
         'pgbouncer',
         'psycopg2',
         'pyasn1',
+        'pygettextpo',
         'pygpgme',
         'pyinotify',
         'pymacaroons',
diff --git a/sourcecode/Makefile b/sourcecode/Makefile
index ee5dad1..5813935 100644
--- a/sourcecode/Makefile
+++ b/sourcecode/Makefile
@@ -3,8 +3,8 @@ PYTHON=python
 # the ones we test.  If we fix them all to have EITHER a good makefile
 # (build and check targets work), or no makefile we can reenable auto
 # detection.
-build_dirs:=cscvs pygettextpo
-test_dirs:=cscvs pygettextpo
+build_dirs:=cscvs
+test_dirs:=cscvs
 
 TEST_ENV_VARS = PYTHON=$(PYTHON)
 
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index ca3b453..e663140 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -26,9 +26,5 @@
     "loggerhead": [
         511,
         "otto-copilot@xxxxxxxxxxxxx-20200918084828-dljpy2eewt6umnmd"
-    ],
-    "pygettextpo": [
-        25,
-        "launchpad@xxxxxxxxxxxxxxxxx-20140116030912-lqm1dtb6a0y4femq"
     ]
 }
\ No newline at end of file
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index 2815420..7d129de 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -14,4 +14,3 @@ bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
 difftacular lp:~launchpad/difftacular/trunk;revno=11
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=511
-pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=25