Launchpad itself

Merge ~cjwatson/launchpad:pygettextpo-0.2 into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. pygettextpo-0.2
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 1fa360e4c4166511a883ba43a3d37250c4eb33d4
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:pygettextpo-0.2
Merge into: launchpad:master
Diff against target: 85 lines (+4/-11)
7 files modified
Makefile (+0/-3)
constraints.txt (+1/-0)
dev/null (+0/-1)
setup.py (+1/-0)
sourcecode/Makefile (+2/-2)
utilities/sourcedeps.cache (+0/-4)
utilities/sourcedeps.conf (+0/-1)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+391436@code.launchpad.net

Commit message

Upgrade to pygettextpo 0.2

Description of the change

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

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index f35bd18..1b84b8d 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -421,9 +421,6 @@ lxc-clean: clean_js clean_pip clean_logs
6 # it does everything expected from a clean target. When the
7 # referenced bug is fixed, this target may be reunited with
8 # the 'clean' target.
9- if test -f sourcecode/pygettextpo/Makefile; then \
10- $(MAKE) -C sourcecode/pygettextpo clean; \
11- fi
12 $(RM) -r env wheelhouse
13 $(RM) -r $(LP_BUILT_JS_ROOT)/*
14 $(RM) -r $(CODEHOSTING_ROOT)/*
15diff --git a/constraints.txt b/constraints.txt
16index 0bebad0..ecd2069 100644
17--- a/constraints.txt
18+++ b/constraints.txt
19@@ -265,6 +265,7 @@ psutil==5.4.2
20 psycopg2==2.7.4
21 pyasn1==0.4.2
22 pyasn1-modules==0.2.1
23+pygettextpo==0.2
24 # lp:~launchpad/pygpgme/pthread
25 # lp1 Link against libgpgme-pthread for thread-safety.
26 pygpgme==0.3+lp1
27diff --git a/lib/gettextpo.so b/lib/gettextpo.so
28deleted file mode 120000
29index 7c10a32..0000000
30--- a/lib/gettextpo.so
31+++ /dev/null
32@@ -1 +0,0 @@
33-../sourcecode/pygettextpo/gettextpo.so
34\ No newline at end of file
35diff --git a/setup.py b/setup.py
36index 0f15f7f..e88b299 100644
37--- a/setup.py
38+++ b/setup.py
39@@ -208,6 +208,7 @@ setup(
40 'pgbouncer',
41 'psycopg2',
42 'pyasn1',
43+ 'pygettextpo',
44 'pygpgme',
45 'pyinotify',
46 'pymacaroons',
47diff --git a/sourcecode/Makefile b/sourcecode/Makefile
48index ee5dad1..5813935 100644
49--- a/sourcecode/Makefile
50+++ b/sourcecode/Makefile
51@@ -3,8 +3,8 @@ PYTHON=python
52 # the ones we test. If we fix them all to have EITHER a good makefile
53 # (build and check targets work), or no makefile we can reenable auto
54 # detection.
55-build_dirs:=cscvs pygettextpo
56-test_dirs:=cscvs pygettextpo
57+build_dirs:=cscvs
58+test_dirs:=cscvs
59
60 TEST_ENV_VARS = PYTHON=$(PYTHON)
61
62diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
63index ca3b453..e663140 100644
64--- a/utilities/sourcedeps.cache
65+++ b/utilities/sourcedeps.cache
66@@ -26,9 +26,5 @@
67 "loggerhead": [
68 511,
69 "otto-copilot@canonical.com-20200918084828-dljpy2eewt6umnmd"
70- ],
71- "pygettextpo": [
72- 25,
73- "launchpad@pqm.canonical.com-20140116030912-lqm1dtb6a0y4femq"
74 ]
75 }
76\ No newline at end of file
77diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
78index 2815420..7d129de 100644
79--- a/utilities/sourcedeps.conf
80+++ b/utilities/sourcedeps.conf
81@@ -14,4 +14,3 @@ bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
82 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
83 difftacular lp:~launchpad/difftacular/trunk;revno=11
84 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=511
85-pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=25

Subscribers

People subscribed via source and target branches

to status/vote changes: