Move requirements files to requirements/

This commit is contained in:
Anna Sidwell 2018-11-24 13:33:41 +00:00
parent 501fcabfb6
commit bb7eff7648
8 changed files with 9 additions and 11 deletions

View File

@ -25,7 +25,7 @@ pytest:
stage: test stage: test
before_script: before_script:
- pip install -U pip setuptools - pip install -U pip setuptools
- pip install -r requirements-test.txt - pip install -r requirements/test.txt
- apt-get update && cat system-requirements-debian.txt | xargs apt-get install -y - apt-get update && cat system-requirements-debian.txt | xargs apt-get install -y
- python manage.py collectstatic - python manage.py collectstatic
script: script:

View File

@ -69,7 +69,7 @@ to set it up, then create a new virtual environment and install dependencies in
one step with: one step with:
```bash ```bash
$ mkvirtualenv -a . -p /usr/bin/python3 -r requirements-devel.txt ojuso-map $ mkvirtualenv -a . -p /usr/bin/python3 -r requirements/devel.txt ojuso-map
``` ```
Then, edit the `postactivate` script: Then, edit the `postactivate` script:
@ -99,7 +99,7 @@ Then install python dependencies:
```bash ```bash
$ pip3 install --upgrade pip setuptools $ pip3 install --upgrade pip setuptools
$ pip3 install -r requirements-devel.txt $ pip3 install -r requirements/devel.txt
``` ```
## Initialise and load configuration ## Initialise and load configuration
@ -199,7 +199,7 @@ You will need to install chromedriver, and if you want to test in Firefox (see c
```bash ```bash
$ pip install -r requirements-test.txt $ pip install -r requirements/test.txt
$ python manage.py collectstatic $ python manage.py collectstatic
$ pytest -v $ pytest -v
``` ```

View File

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile # This file is autogenerated by pip-compile
# To update, run: # To update, run:
# #
# pip-compile --output-file requirements.txt requirements.in # pip-compile --output-file requirements/base.txt requirements/base.in
# #
babel==2.6.0 # via django-phonenumber-field babel==2.6.0 # via django-phonenumber-field
boto3==1.9.12 boto3==1.9.12
@ -38,7 +38,7 @@ idna==2.7 # via requests
jmespath==0.9.3 # via boto3, botocore jmespath==0.9.3 # via boto3, botocore
phonenumbers==8.9.14 # via django-phonenumber-field phonenumbers==8.9.14 # via django-phonenumber-field
pillow==5.2.0 # via django-avatar pillow==5.2.0 # via django-avatar
pip-tools==3.0.0 pip-tools==3.1.0
psycopg2==2.7.5 psycopg2==2.7.5
python-dateutil==2.7.3 # via botocore python-dateutil==2.7.3 # via botocore
python-memcached==1.59 python-memcached==1.59

View File

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile # This file is autogenerated by pip-compile
# To update, run: # To update, run:
# #
# pip-compile --output-file requirements-devel.txt requirements-devel.in # pip-compile --output-file requirements/devel.txt requirements/devel.in
# #
astroid==2.0.4 # via pylint, requirements-detector astroid==2.0.4 # via pylint, requirements-detector
blessings==1.7 # via curtsies blessings==1.7 # via curtsies
@ -16,7 +16,6 @@ flake8==3.5.0 # via flake8-polyfill
greenlet==0.4.15 # via bpython greenlet==0.4.15 # via bpython
idna==2.7 # via requests idna==2.7 # via requests
isort==4.3.4 isort==4.3.4
selenium==3.12.0
lazy-object-proxy==1.3.1 # via astroid lazy-object-proxy==1.3.1 # via astroid
mccabe==0.6.1 # via flake8, prospector, pylint mccabe==0.6.1 # via flake8, prospector, pylint
pep8-naming==0.7.0 # via prospector pep8-naming==0.7.0 # via prospector
@ -33,7 +32,6 @@ requirements-detector==0.6 # via prospector
setoptconf==0.2.0 # via prospector setoptconf==0.2.0 # via prospector
six==1.11.0 # via astroid, blessings, bpython, pydocstyle six==1.11.0 # via astroid, blessings, bpython, pydocstyle
snowballstemmer==1.2.1 # via pydocstyle snowballstemmer==1.2.1 # via pydocstyle
typed-ast==1.1.0 # via astroid
typing==3.6.6 # via curtsies typing==3.6.6 # via curtsies
urllib3==1.23 # via requests urllib3==1.23 # via requests
wcwidth==0.1.7 # via curtsies wcwidth==0.1.7 # via curtsies

View File

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile # This file is autogenerated by pip-compile
# To update, run: # To update, run:
# #
# pip-compile --output-file requirements-test.txt requirements-test.in # pip-compile --output-file requirements/test.txt requirements/test.in
# #
atomicwrites==1.2.1 # via pytest atomicwrites==1.2.1 # via pytest
attrs==18.2.0 # via pytest attrs==18.2.0 # via pytest
@ -14,5 +14,5 @@ py==1.6.0 # via pytest
pytest-cov==2.6.0 pytest-cov==2.6.0
pytest-django==3.4.3 pytest-django==3.4.3
pytest==3.8.1 pytest==3.8.1
six==1.11.0 # via more-itertools, pytest
selenium==3.12.0 selenium==3.12.0
six==1.11.0 # via more-itertools, pytest