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
=== modified file 'buildout.cfg'
--- buildout.cfg 2012-10-31 11:04:06 +0000
+++ buildout.cfg 2012-11-14 17:14:19 +0000
@@ -39,7 +39,6 @@
39eggs = libdep-service[testing]39eggs = libdep-service[testing]
40 djangofixture40 djangofixture
41 pep841 pep8
42 pkgme-devportal[testing]
43 pyflakes42 pyflakes
44 testresources43 testresources
45 testscenarios44 testscenarios
4645
=== modified file 'djlibdep/_version.py'
--- djlibdep/_version.py 2012-06-29 12:14:48 +0000
+++ djlibdep/_version.py 2012-11-14 17:14:19 +0000
@@ -16,8 +16,6 @@
1616
17"""Figure out what version we're running."""17"""Figure out what version we're running."""
1818
19import os
20
2119
22def get_revno(path):20def get_revno(path):
23 import bzrlib.errors21 import bzrlib.errors
@@ -41,22 +39,3 @@
41def get_version():39def get_version():
42 """Return the version of djpkgme in use."""40 """Return the version of djpkgme in use."""
43 return _version_for_path(__file__)41 return _version_for_path(__file__)
44
45
46def get_sourcecode_version(name):
47 """Return the version of a sourcecode dependency.
48
49 When a dependency is provided as a branch in the `sourcecode`
50 directory, this function will return it's value.
51
52 :param name: the name of the dependency, corresponding to the
53 directory name of the branch beneath the `sourcecode`
54 directory.
55 """
56 start = os.path.abspath(__file__)
57 dirname = os.path.dirname
58 root = dirname(dirname(dirname(start)))
59 name_dir = os.path.join(root, 'sourcecode', name)
60 if os.path.isdir(name_dir):
61 return _version_for_path(name_dir)
62 return "No sourcecode dependency"
6342
=== modified file 'djlibdep/preflight.py'
--- djlibdep/preflight.py 2012-06-29 12:28:09 +0000
+++ djlibdep/preflight.py 2012-11-14 17:14:19 +0000
@@ -16,10 +16,7 @@
1616
17import preflight17import preflight
1818
19from ._version import (19from ._version import get_version
20 get_version,
21 get_sourcecode_version,
22 )
2320
2421
25class DjlibdepPreflight(preflight.Preflight):22class DjlibdepPreflight(preflight.Preflight):
@@ -27,9 +24,6 @@
27 def versions(self):24 def versions(self):
28 return [25 return [
29 {'name': "djlibdep", 'version': get_version()},26 {'name': "djlibdep", 'version': get_version()},
30 {'name': "pkgme", 'version': get_sourcecode_version('pkgme')},
31 {'name': "pkgme-devportal",
32 'version': get_sourcecode_version('pkgme-devportal')},
33 ]27 ]
3428
3529
3630
=== modified file 'djlibdep/tests/test_preflight.py'
--- djlibdep/tests/test_preflight.py 2012-06-29 12:14:48 +0000
+++ djlibdep/tests/test_preflight.py 2012-11-14 17:14:19 +0000
@@ -52,11 +52,3 @@
52 def test_djlibdep_in_versions(self):52 def test_djlibdep_in_versions(self):
53 versions = DjlibdepPreflight().versions()53 versions = DjlibdepPreflight().versions()
54 self.assertThat(versions, HasVersionEntryFor('djlibdep'))54 self.assertThat(versions, HasVersionEntryFor('djlibdep'))
55
56 def test_pkgme_in_versions(self):
57 versions = DjlibdepPreflight().versions()
58 self.assertThat(versions, HasVersionEntryFor('pkgme'))
59
60 def test_pkgme_binary_in_versions(self):
61 versions = DjlibdepPreflight().versions()
62 self.assertThat(versions, HasVersionEntryFor('pkgme-devportal'))
6355
=== modified file 'setup.py'
--- setup.py 2012-10-29 17:06:07 +0000
+++ setup.py 2012-11-14 17:14:19 +0000
@@ -26,6 +26,7 @@
26 author_email="canonical-consumer-applications@lists.launchpad.net",26 author_email="canonical-consumer-applications@lists.launchpad.net",
27 license="AGPL3",27 license="AGPL3",
28 install_requires=[28 install_requires=[
29 'bzr', # for our preflight
29 'configglue>=1.0.1',30 'configglue>=1.0.1',
30 'django-configglue>=0.6.1',31 'django-configglue>=0.6.1',
31 'django-preflight>=0.1',32 'django-preflight>=0.1',
@@ -34,8 +35,6 @@
34 'oops_datedir_repo>=0.0.17',35 'oops_datedir_repo>=0.0.17',
35 'oops_dictconfig>=0.0.1',36 'oops_dictconfig>=0.0.1',
36 'oops_wsgi>=0.0.10',37 'oops_wsgi>=0.0.10',
37 'pkgme',
38 'pkgme-devportal>=0.4.11',
39 'south>=0.7.3',38 'south>=0.7.3',
40 'django-celery==2.5.0',39 'django-celery==2.5.0',
41 'django-openid-auth>=0.4',40 'django-openid-auth>=0.4',
@@ -43,6 +42,7 @@
43 # The 0.4 package of django-openid-auth doesn't depend on42 # The 0.4 package of django-openid-auth doesn't depend on
44 # python-openid, so we have to list it here.43 # python-openid, so we have to list it here.
45 'python-openid>=2.2.5',44 'python-openid>=2.2.5',
45 'storm',
46 'Twisted',46 'Twisted',
47 'txstatsd',47 'txstatsd',
48 'treeshape',48 'treeshape',
@@ -54,6 +54,7 @@
54 },54 },
55 extras_require = {55 extras_require = {
56 'testing': [56 'testing': [
57 'postgresfixture',
57 'testtools',58 'testtools',
58 'treeshape',59 'treeshape',
59 ],60 ],
6061
=== modified file 'versions.cfg'
--- versions.cfg 2012-10-31 11:04:06 +0000
+++ versions.cfg 2012-11-14 17:14:19 +0000
@@ -10,11 +10,9 @@
10[versions]10[versions]
11amqplib = 1.0.211amqplib = 1.0.2
12anyjson = 0.3.312anyjson = 0.3.3
13argparse = 1.2.1
14bson = 0.3.313bson = 0.3.3
15bzr = 2.5.114bzr = 2.5.1
16celery = 2.5.015celery = 2.5.0
17Cheetah = 2.4.4
18configglue = 1.0.116configglue = 1.0.1
19distribute = 0.6.3017distribute = 0.6.30
20django = 1.3.118django = 1.3.1
@@ -34,7 +32,6 @@
34lazr.restfulclient = 0.13.032lazr.restfulclient = 0.13.0
35lazr.uri = 1.0.333lazr.uri = 1.0.3
36libdep-service-python = 0.0.534libdep-service-python = 0.0.5
37Markdown = 2.2.0
38oauth = 1.0.135oauth = 1.0.1
39oops = 0.0.1036oops = 0.0.10
40oops-datedir-repo = 0.0.1737oops-datedir-repo = 0.0.17
@@ -42,14 +39,10 @@
42oops-wsgi = 0.0.1039oops-wsgi = 0.0.10
43paste = 1.7.5.140paste = 1.7.5.1
44pep8 = 1.3.341pep8 = 1.3.3
45PIL = 1.1.7
46pkgme = 0.4.1
47pkgme-devportal = 0.4.11
48postgresfixture = 0.1.242postgresfixture = 0.1.2
49psycopg2 = 2.4.543psycopg2 = 2.4.5
50pyflakes = 0.5.044pyflakes = 0.5.0
51python-dateutil = 1.545python-dateutil = 1.5
52python-debian = 0.1.16
53python-openid = 2.2.546python-openid = 2.2.5
54pytz = 2012d47pytz = 2012d
55pyxdg = 0.2348pyxdg = 0.23

Subscribers

People subscribed via source and target branches