Merge lp:~pablorubianes-uy/loco-team-portal/1490784 into lp:loco-team-portal

Proposed by Pablo Rubianes
Status: Merged
Merged at revision: 683
Proposed branch: lp:~pablorubianes-uy/loco-team-portal/1490784
Merge into: lp:loco-team-portal
Diff against target: 26 lines (+1/-4)
2 files modified
Makefile (+0/-3)
requirements/prod.txt (+1/-1)
To merge this branch: bzr merge lp:~pablorubianes-uy/loco-team-portal/1490784
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
ԜаӀtеr Ⅼарсһуnѕkі Approve
Adnane Belmadiaf Approve
Review via email: mp+269692@code.launchpad.net

Description of the change

Upgrade the vobject version to 0.8.2

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

I guess we just need to remove distribute_setup.py and upgrade vobject to 0.8.2

review: Needs Fixing
Revision history for this message
Pablo Rubianes (pablorubianes-uy) wrote :

Adnane, yes if you remove the distribute_setup and upgrade the vobject it
works. want me to get the merge request or you make this change?

On Wed, Feb 10, 2016 at 10:10 AM Adnane Belmadiaf <email address hidden>
wrote:

> Review: Needs Fixing
>
> I guess we just need to remove distribute_setup.py and upgrade vobject to
> 0.8.2
> --
>
> https://code.launchpad.net/~pablorubianes-uy/loco-team-portal/1490784/+merge/269692
> You are the owner of lp:~pablorubianes-uy/loco-team-portal/1490784.
>

Revision history for this message
Adnane Belmadiaf (daker) wrote :

Yes please, just update the merge request.

684. By Pablo Rubianes

vobject update 0.8.2

Revision history for this message
Pablo Rubianes (pablorubianes-uy) wrote :

Done Daker

Cheers

Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve
Revision history for this message
ԜаӀtеr Ⅼарсһуnѕkі (wxl) wrote :

patched, tested and make init works! thank you, very much!

review: Approve
Revision history for this message
Simon Quigley (tsimonq2) wrote :

It works! Thank you!

Revision history for this message
Simon Quigley (tsimonq2) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-05-15 22:50:21 +0000
3+++ Makefile 2016-02-12 00:55:21 +0000
4@@ -11,9 +11,6 @@
5
6 env:
7 virtualenv --clear --no-site-packages --python=/usr/bin/python env
8- wget http://python-distribute.org/distribute_setup.py
9- $(py) distribute_setup.py
10- rm distribute_setup.py
11 $(pip) install --allow-unverified lazr.authentication lazr.authentication
12 $(pip) install --allow-unverified bzr bzr==2.6
13 $(pip) install -r requirements/prod.txt
14
15=== modified file 'requirements/prod.txt'
16--- requirements/prod.txt 2014-05-15 22:50:21 +0000
17+++ requirements/prod.txt 2016-02-12 00:55:21 +0000
18@@ -15,7 +15,7 @@
19 python-openid==2.2.4
20 pytz==2010b
21 python-dateutil==1.5
22-vobject==0.8.1c
23+vobject==0.8.2
24 simplejson==2.0.9
25 feedparser
26 python-gettext

Subscribers

People subscribed via source and target branches