libdep-service-python

Merge lp:~jml/libdep-service-python/new-libdep into lp:libdep-service-python

  1. new-libdep
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~jml/libdep-service-python/new-libdep
Merge into: lp:libdep-service-python
Diff against target: 71 lines (+11/-10)
2 files modified
distribute_setup.py (+1/-1)
versions.cfg (+10/-9)
To merge this branch: bzr merge lp:~jml/libdep-service-python/new-libdep
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+134432@code.launchpad.net

Commit message

Bump versions that we depend on

Description of the change

These changes are entirely mechanical.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

The attempt to merge lp:~jml/libdep-service-python/new-libdep into lp:libdep-service-python failed. Below is the output from the failed tests.

Tree is up to date at revision 44 of branch bzr+ssh://bazaar.launchpad.net/+branch/ca-download-cache
While:
  Installing scripts.
  Getting distribution for 'libdep-service[testing]==0.5'.
Error: Couldn't find a distribution for 'libdep-service[testing]==0.5'.
make: *** [bin/py] Error 1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'distribute_setup.py'
2--- distribute_setup.py 2012-10-18 12:39:59 +0000
3+++ distribute_setup.py 2012-11-15 10:42:45 +0000
4@@ -46,7 +46,7 @@
5 args = [quote(arg) for arg in args]
6 return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
7
8-DEFAULT_VERSION = "0.6.29DEV"
9+DEFAULT_VERSION = "0.6.30"
10 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
11 SETUPTOOLS_FAKED_VERSION = "0.6c11"
12
13
14=== modified file 'versions.cfg'
15--- versions.cfg 2012-10-31 15:35:39 +0000
16+++ versions.cfg 2012-11-15 10:42:45 +0000
17@@ -8,18 +8,20 @@
18 #
19 # Alphabetical, case-insensitive, please! :-)
20 [versions]
21+amqplib = 1.0.2
22+anyjson = 0.3.3
23 bson = 0.3.3
24 bzr = 2.5.1
25-Cheetah = 2.4.4
26+celery = 2.5.0
27 configglue = 1.0.3
28-# jml's fork. Code lives at https://bitbucket.org/mumak/distribute.
29 # DEFAULT_VERSION in distribute_setup.py must match the distribute version here
30 # If you change it here, change it there.
31-distribute = 0.6.29DEV
32+distribute = 0.6.30
33 django = 1.3.1
34 django-configglue = 0.6.1
35 django-openid-auth = 0.4
36 django-pgtools = 0.1
37+django-picklefield = 0.2.1
38 django-preflight = 0.1
39 fixtures = 0.3.9
40 flask = 0.9
41@@ -27,12 +29,12 @@
42 iso8601 = 0.1.4
43 Jinja2 = 2.6
44 keyring = 0.9.2
45+kombu = 2.1.1
46 launchpadlib = 1.10.2
47 lazr.authentication = 0.1.2
48 lazr.restfulclient = 0.13.0
49 lazr.uri = 1.0.3
50-libdep-service = 0.3
51-Markdown = 2.2.0
52+libdep-service = 0.5
53 netlib = 0.2.1
54 oauth = 1.0.1
55 oops = 0.0.10
56@@ -41,12 +43,11 @@
57 oops-wsgi = 0.0.10
58 paste = 1.7.5.1
59 pathod = 0.2.1
60-PIL = 1.1.7
61-pkgme = 0.4.3
62-python-debian = 0.1.16
63-pkgme-devportal = 0.4.11
64+postgresfixture = 0.1.2
65+psycopg2 = 2.4.5
66 pyasn1 = 0.1.4
67 pyopenssl = 0.13
68+python-dateutil = 1.5
69 python-openid = 2.2.5
70 pytz = 2012d
71 pyxdg = 0.23

Subscribers

People subscribed via source and target branches