Explorar el Código

restructuring requirements to not pollute non-heroku environments with heroku specific requirements

David Ray hace 8 años
padre
commit
b40c3da1aa
Se han modificado 6 ficheros con 9 adiciones y 8 borrados
  1. 0 1
      Procfile
  2. 1 1
      readme.md
  3. 1 5
      requirements.txt
  4. 5 0
      requirements/base.txt
  5. 1 0
      requirements/heroku.txt
  6. 1 1
      vagrant/provision.sh

+ 0 - 1
Procfile

@@ -1,3 +1,2 @@
-release: pip install -r requirements_heroku.txt
 release: yes "yes" | python manage.py migrate
 release: yes "yes" | python manage.py migrate
 web: gunicorn bakerydemo.heroku_wsgi --log-file -
 web: gunicorn bakerydemo.heroku_wsgi --log-file -

+ 1 - 1
readme.md

@@ -53,7 +53,7 @@ With PIP installed run the following commands:
 
 
     git clone git@github.com:wagtail/bakerydemo.git
     git clone git@github.com:wagtail/bakerydemo.git
     cd wagtaildemo
     cd wagtaildemo
-    pip install -r requirements.txt
+    pip install -r requirements/base.txt
     ./manage.py migrate
     ./manage.py migrate
     ./manage.py load_initial_data
     ./manage.py load_initial_data
     ./manage.py runserver
     ./manage.py runserver

+ 1 - 5
requirements.txt

@@ -1,5 +1 @@
-Django
-elasticsearch
-wagtail
-wagtailfontawesome
-Pillow
+-r requirements/heroku.txt

+ 5 - 0
requirements/base.txt

@@ -0,0 +1,5 @@
+Django
+elasticsearch
+wagtail
+wagtailfontawesome
+Pillow

+ 1 - 0
requirements_heroku.txt → requirements/heroku.txt

@@ -1,3 +1,4 @@
+-r base.txt
 # Additional dependencies for Heroku deployment
 # Additional dependencies for Heroku deployment
 dj-database-url
 dj-database-url
 whitenoise
 whitenoise

+ 1 - 1
vagrant/provision.sh

@@ -25,7 +25,7 @@ su - vagrant -c "echo $PROJECT_DIR > $VIRTUALENV_DIR/.project"
 su - vagrant -c "$PIP install --upgrade pip"
 su - vagrant -c "$PIP install --upgrade pip"
 
 
 # Install PIP requirements
 # Install PIP requirements
-su - vagrant -c "$PIP install -r $PROJECT_DIR/requirements.txt"
+su - vagrant -c "$PIP install -r $PROJECT_DIR/requirements/base.txt"
 
 
 
 
 # Set execute permissions on manage.py as they get lost if we build from a zip file
 # Set execute permissions on manage.py as they get lost if we build from a zip file