Merge pull request #579 from pgiraud/pyramid_version

Fix the pyramid version
hotosm · Apr 20, 2015 · c5f7c5b · c5f7c5b
2 parents 6036ead + a5f2bab
commit c5f7c5b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
 install:
 - virtualenv env
 - source env/bin/activate
-- pip install -r requirements.txt
+- python setup.py develop
 - sudo service postgresql restart
 - sudo -u postgres createuser www-data --no-superuser --no-createdb --no-createrole
 - sudo -u postgres createdb -O www-data osmtm

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ To create a virtual Python environment:
     cd osm-tasking-manager2
     sudo easy_install virtualenv
     virtualenv --no-site-packages env
-    ./env/bin/pip install -r requirements.txt
+    ./env/bin/python setup.py develop
 
 *Tip: if you encounter problems installing `psycopg2` especially on Mac, it is recommended to follow advice proposed [here](http://stackoverflow.com/questions/22313407/clang-error-unknown-argument-mno-fused-madd-python-package-installation-fa).*
 

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 CHANGES = open(os.path.join(here, 'CHANGELOG.md')).read()
 
 requires = [
-    'pyramid==1.6-dev',
+    'pyramid==1.6a1',
     'pyramid_mako==1.0.2',
     'SQLAlchemy==0.9.9',
     'transaction',