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
=== modified file 'Makefile'
--- Makefile 2013-02-02 00:03:21 +0000
+++ Makefile 2014-05-15 22:53:20 +0000
@@ -14,6 +14,8 @@
14 wget http://python-distribute.org/distribute_setup.py14 wget http://python-distribute.org/distribute_setup.py
15 $(py) distribute_setup.py15 $(py) distribute_setup.py
16 rm distribute_setup.py16 rm distribute_setup.py
17 $(pip) install --allow-unverified lazr.authentication lazr.authentication
18 $(pip) install --allow-unverified bzr bzr==2.6
17 $(pip) install -r requirements/prod.txt19 $(pip) install -r requirements/prod.txt
18 cp loco_directory/local_settings.py.sample loco_directory/local_settings.py20 cp loco_directory/local_settings.py.sample loco_directory/local_settings.py
1921
@@ -50,7 +52,7 @@
50 rm loco_directory/loco_directory.db52 rm loco_directory/loco_directory.db
5153
52depends:54depends:
53 apt-get install python2.6 python2.6-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext55 apt-get install python2.7 python2.7-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext
5456
55pylint: env57pylint: env
56 $(pylint) --rcfile=pylint.rc loco_directory/*/*.py58 $(pylint) --rcfile=pylint.rc loco_directory/*/*.py
5759
=== modified file 'requirements/dev.txt'
--- requirements/dev.txt 2012-12-26 16:10:14 +0000
+++ requirements/dev.txt 2014-05-15 22:53:20 +0000
@@ -21,7 +21,7 @@
21django-debug-toolbar==0.8.421django-debug-toolbar==0.8.4
2222
23# Non-standard dependencies23# Non-standard dependencies
24-f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.024-f https://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
25launchpadlib==1.6.025launchpadlib==1.6.0
2626
2727
2828
=== modified file 'requirements/prod.txt'
--- requirements/prod.txt 2012-12-26 16:10:14 +0000
+++ requirements/prod.txt 2014-05-15 22:53:20 +0000
@@ -8,7 +8,6 @@
88
9Django==1.3.39Django==1.3.3
10South==0.7.310South==0.7.3
11bzr==2.6b2
12distribute==0.6.1011distribute==0.6.10
13django-openid-auth==0.412django-openid-auth==0.4
14# pyscopg is only needed for production like environments13# pyscopg is only needed for production like environments
@@ -23,7 +22,7 @@
23pylint==0.25.022pylint==0.25.0
2423
25# Non-standard dependencies24# Non-standard dependencies
26-f http://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.025-f https://launchpad.net/launchpadlib/trunk/1.6.0/+download/launchpadlib-1.6.0.tar.gz#egg=launchpadlib-1.6.0
27launchpadlib==1.6.026launchpadlib==1.6.0
2827
2928

Subscribers

People subscribed via source and target branches