libdep-service

Merge lp:~jml/libdep-service/drop-devportalbinary into lp:libdep-service

  1. drop-devportalbinary
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 88
Merged at revision: 84
Proposed branch: lp:~jml/libdep-service/drop-devportalbinary
Merge into: lp:libdep-service
Prerequisite: lp:~jml/libdep-service/what-devportal-binary
Diff against target: 165 lines (+4/-46)
6 files modified
buildout.cfg (+0/-1)
djlibdep/_version.py (+0/-21)
djlibdep/preflight.py (+1/-7)
djlibdep/tests/test_preflight.py (+0/-8)
setup.py (+3/-2)
versions.cfg (+0/-7)
To merge this branch: bzr merge lp:~jml/libdep-service/drop-devportalbinary
Reviewer Review Type Date Requested Status
Canonical Consumer Applications Hackers Pending
Review via email: mp+134326@code.launchpad.net

Commit message

Actually drop the dependency on pkgme & pkgme-devportal.

Description of the change

Actually drop the dependency on pkgme & pkgme-devportal.

Cleans up the explicit, direct dependencies, which we were getting wrong because we were getting them for free via devportal.

Removes preflight versions, for obvious reasons.

To post a comment you must log in.
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

The prerequisite https://code.launchpad.net/~jml/libdep-service/what-devportal-binary has not yet been merged into https://code.launchpad.net/~canonical-ca-hackers/libdep-service/trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2012-10-31 11:04:06 +0000
3+++ buildout.cfg 2012-11-14 17:14:19 +0000
4@@ -39,7 +39,6 @@
5 eggs = libdep-service[testing]
6 djangofixture
7 pep8
8- pkgme-devportal[testing]
9 pyflakes
10 testresources
11 testscenarios
12
13=== modified file 'djlibdep/_version.py'
14--- djlibdep/_version.py 2012-06-29 12:14:48 +0000
15+++ djlibdep/_version.py 2012-11-14 17:14:19 +0000
16@@ -16,8 +16,6 @@
17
18 """Figure out what version we're running."""
19
20-import os
21-
22
23 def get_revno(path):
24 import bzrlib.errors
25@@ -41,22 +39,3 @@
26 def get_version():
27 """Return the version of djpkgme in use."""
28 return _version_for_path(__file__)
29-
30-
31-def get_sourcecode_version(name):
32- """Return the version of a sourcecode dependency.
33-
34- When a dependency is provided as a branch in the `sourcecode`
35- directory, this function will return it's value.
36-
37- :param name: the name of the dependency, corresponding to the
38- directory name of the branch beneath the `sourcecode`
39- directory.
40- """
41- start = os.path.abspath(__file__)
42- dirname = os.path.dirname
43- root = dirname(dirname(dirname(start)))
44- name_dir = os.path.join(root, 'sourcecode', name)
45- if os.path.isdir(name_dir):
46- return _version_for_path(name_dir)
47- return "No sourcecode dependency"
48
49=== modified file 'djlibdep/preflight.py'
50--- djlibdep/preflight.py 2012-06-29 12:28:09 +0000
51+++ djlibdep/preflight.py 2012-11-14 17:14:19 +0000
52@@ -16,10 +16,7 @@
53
54 import preflight
55
56-from ._version import (
57- get_version,
58- get_sourcecode_version,
59- )
60+from ._version import get_version
61
62
63 class DjlibdepPreflight(preflight.Preflight):
64@@ -27,9 +24,6 @@
65 def versions(self):
66 return [
67 {'name': "djlibdep", 'version': get_version()},
68- {'name': "pkgme", 'version': get_sourcecode_version('pkgme')},
69- {'name': "pkgme-devportal",
70- 'version': get_sourcecode_version('pkgme-devportal')},
71 ]
72
73
74
75=== modified file 'djlibdep/tests/test_preflight.py'
76--- djlibdep/tests/test_preflight.py 2012-06-29 12:14:48 +0000
77+++ djlibdep/tests/test_preflight.py 2012-11-14 17:14:19 +0000
78@@ -52,11 +52,3 @@
79 def test_djlibdep_in_versions(self):
80 versions = DjlibdepPreflight().versions()
81 self.assertThat(versions, HasVersionEntryFor('djlibdep'))
82-
83- def test_pkgme_in_versions(self):
84- versions = DjlibdepPreflight().versions()
85- self.assertThat(versions, HasVersionEntryFor('pkgme'))
86-
87- def test_pkgme_binary_in_versions(self):
88- versions = DjlibdepPreflight().versions()
89- self.assertThat(versions, HasVersionEntryFor('pkgme-devportal'))
90
91=== modified file 'setup.py'
92--- setup.py 2012-10-29 17:06:07 +0000
93+++ setup.py 2012-11-14 17:14:19 +0000
94@@ -26,6 +26,7 @@
95 author_email="canonical-consumer-applications@lists.launchpad.net",
96 license="AGPL3",
97 install_requires=[
98+ 'bzr', # for our preflight
99 'configglue>=1.0.1',
100 'django-configglue>=0.6.1',
101 'django-preflight>=0.1',
102@@ -34,8 +35,6 @@
103 'oops_datedir_repo>=0.0.17',
104 'oops_dictconfig>=0.0.1',
105 'oops_wsgi>=0.0.10',
106- 'pkgme',
107- 'pkgme-devportal>=0.4.11',
108 'south>=0.7.3',
109 'django-celery==2.5.0',
110 'django-openid-auth>=0.4',
111@@ -43,6 +42,7 @@
112 # The 0.4 package of django-openid-auth doesn't depend on
113 # python-openid, so we have to list it here.
114 'python-openid>=2.2.5',
115+ 'storm',
116 'Twisted',
117 'txstatsd',
118 'treeshape',
119@@ -54,6 +54,7 @@
120 },
121 extras_require = {
122 'testing': [
123+ 'postgresfixture',
124 'testtools',
125 'treeshape',
126 ],
127
128=== modified file 'versions.cfg'
129--- versions.cfg 2012-10-31 11:04:06 +0000
130+++ versions.cfg 2012-11-14 17:14:19 +0000
131@@ -10,11 +10,9 @@
132 [versions]
133 amqplib = 1.0.2
134 anyjson = 0.3.3
135-argparse = 1.2.1
136 bson = 0.3.3
137 bzr = 2.5.1
138 celery = 2.5.0
139-Cheetah = 2.4.4
140 configglue = 1.0.1
141 distribute = 0.6.30
142 django = 1.3.1
143@@ -34,7 +32,6 @@
144 lazr.restfulclient = 0.13.0
145 lazr.uri = 1.0.3
146 libdep-service-python = 0.0.5
147-Markdown = 2.2.0
148 oauth = 1.0.1
149 oops = 0.0.10
150 oops-datedir-repo = 0.0.17
151@@ -42,14 +39,10 @@
152 oops-wsgi = 0.0.10
153 paste = 1.7.5.1
154 pep8 = 1.3.3
155-PIL = 1.1.7
156-pkgme = 0.4.1
157-pkgme-devportal = 0.4.11
158 postgresfixture = 0.1.2
159 psycopg2 = 2.4.5
160 pyflakes = 0.5.0
161 python-dateutil = 1.5
162-python-debian = 0.1.16
163 python-openid = 2.2.5
164 pytz = 2012d
165 pyxdg = 0.23

Subscribers

People subscribed via source and target branches