LoCo Team Portal

Merge lp:~daker/loco-team-portal/fix.makefile into lp:loco-team-portal

  1. fix.makefile
  2. Merge into 0.2
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Michael Hall
Approved revision: 676
Merged at revision: 676
Proposed branch: lp:~daker/loco-team-portal/fix.makefile
Merge into: lp:loco-team-portal
Diff against target: 53 lines (+5/-4)
3 files modified
Makefile (+3/-1)
requirements/dev.txt (+1/-1)
requirements/prod.txt (+1/-2)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.makefile
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+219768@code.launchpad.net

Commit message

Fixed venv installation

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good to me

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 2013-02-02 00:03:21 +0000
3+++ Makefile 2014-05-15 22:53:20 +0000
4@@ -14,6 +14,8 @@
5 wget http://python-distribute.org/distribute_setup.py
6 $(py) distribute_setup.py
7 rm distribute_setup.py
8+ $(pip) install --allow-unverified lazr.authentication lazr.authentication
9+ $(pip) install --allow-unverified bzr bzr==2.6
10 $(pip) install -r requirements/prod.txt
11 cp loco_directory/local_settings.py.sample loco_directory/local_settings.py
12
13@@ -50,7 +52,7 @@
14 rm loco_directory/loco_directory.db
15
16 depends:
17- apt-get install python2.6 python2.6-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext
18+ apt-get install python2.7 python2.7-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext
19
20 pylint: env
21 $(pylint) --rcfile=pylint.rc loco_directory/*/*.py
22
23=== modified file 'requirements/dev.txt'
24--- requirements/dev.txt 2012-12-26 16:10:14 +0000
25+++ requirements/dev.txt 2014-05-15 22:53:20 +0000
26@@ -21,7 +21,7 @@
27 django-debug-toolbar==0.8.4
28
29 # Non-standard dependencies
30--f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
31+-f https://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
32 launchpadlib==1.6.0
33
34
35
36=== modified file 'requirements/prod.txt'
37--- requirements/prod.txt 2012-12-26 16:10:14 +0000
38+++ requirements/prod.txt 2014-05-15 22:53:20 +0000
39@@ -8,7 +8,6 @@
40
41 Django==1.3.3
42 South==0.7.3
43-bzr==2.6b2
44 distribute==0.6.10
45 django-openid-auth==0.4
46 # pyscopg is only needed for production like environments
47@@ -23,7 +22,7 @@
48 pylint==0.25.0
49
50 # Non-standard dependencies
51--f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
52+-f https://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
53 launchpadlib==1.6.0
54
55

Subscribers

People subscribed via source and target branches