pkgme-devportal

Merge lp:~jml/pkgme-devportal/use-pkgme-0.4 into lp:pkgme-devportal

  1. use-pkgme-0.4
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 103
Merged at revision: 100
Proposed branch: lp:~jml/pkgme-devportal/use-pkgme-0.4
Merge into: lp:pkgme-devportal
Diff against target: 57 lines (+6/-4)
4 files modified
.bzrignore (+2/-0)
devportalbinary/__init__.py (+1/-1)
setup.py (+1/-1)
versions.cfg (+2/-2)
To merge this branch: bzr merge lp:~jml/pkgme-devportal/use-pkgme-0.4
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+123123@code.launchpad.net

Commit message

Bump version numbers

Description of the change

I can't use pkgme 0.4.0 in pkgme-service until pkgme-devportal also uses
pkgme 0.4.0.

While here, bumped the treeshape dependency and added a third part to the revno.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve
Revision history for this message
James Westby (james-w) wrote :

I wonder if the setup.py dependency should be pkgme>=0.4.0?

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

The attempt to merge lp:~jml/pkgme-devportal/use-pkgme-0.4 into lp:pkgme-devportal failed. Below is the output from the failed tests.

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

lp:~jml/pkgme-devportal/use-pkgme-0.4 updated
103. By Jonathan Lange

More flexibility

Revision history for this message
Jonathan Lange (jml) wrote :

Changed. Also hit "Enter" on the command to commit new pkgme.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-08-08 00:43:21 +0000
3+++ .bzrignore 2012-09-06 17:18:17 +0000
4@@ -9,3 +9,5 @@
5 ./parts
6 ./pkgme_devportal.egg-info
7 ./bin
8+bin/buildout
9+bin/py
10
11=== modified file 'devportalbinary/__init__.py'
12--- devportalbinary/__init__.py 2012-08-31 15:08:14 +0000
13+++ devportalbinary/__init__.py 2012-09-06 17:18:17 +0000
14@@ -9,7 +9,7 @@
15 ]
16
17
18-__version__ = '0.4'
19+__version__ = '0.4.0'
20
21
22 def get_backends_path():
23
24=== modified file 'setup.py'
25--- setup.py 2012-08-28 13:29:31 +0000
26+++ setup.py 2012-09-06 17:18:17 +0000
27@@ -38,7 +38,7 @@
28 'configglue',
29 'launchpadlib',
30 'PIL',
31- 'pkgme==0.3.1',
32+ 'pkgme>=0.4.0',
33 'fixtures',
34 'storm',
35 ],
36
37=== modified file 'versions.cfg'
38--- versions.cfg 2012-08-28 11:01:17 +0000
39+++ versions.cfg 2012-09-06 17:18:17 +0000
40@@ -25,7 +25,7 @@
41 oauth = 1.0.1
42 PIL = 1.1.7
43 postgresfixture = 0.1.2
44-pkgme = 0.3.1
45+pkgme = 0.4.0
46 psycopg2 = 2.4.5
47 python-debian = 0.1.16
48 python-subunit = 0.0.8
49@@ -34,7 +34,7 @@
50 storm = 0.19
51 testresources = 0.2.5
52 testtools = 0.9.16
53-treeshape = 0.2.0
54+treeshape = 0.2.1
55 wadllib = 1.3.1
56 wsgi-intercept = 0.5.1
57 z3c.recipe.scripts = 1.0.1

Subscribers

People subscribed via source and target branches