Rev dependencies, use only two requirements files (devel & base)
This commit is contained in:
parent
1aea545ff7
commit
fc7a9621a7
@ -37,8 +37,7 @@ before_script:
|
||||
- virtualenv venv
|
||||
- source venv/bin/activate
|
||||
- pip install -U pip setuptools
|
||||
- pip install -r requirements/base.txt
|
||||
- pip install -r requirements/test.txt
|
||||
- pip install -r requirements/devel.txt
|
||||
- python manage.py collectstatic
|
||||
|
||||
pytest:
|
||||
|
||||
@ -205,7 +205,6 @@ You will need to install chromedriver, and if you want to test in Firefox (see c
|
||||
|
||||
```bash
|
||||
|
||||
$ pip install -r requirements/test.txt
|
||||
$ python manage.py collectstatic
|
||||
$ pytest -v
|
||||
```
|
||||
|
||||
@ -24,6 +24,7 @@ djangorestframework
|
||||
djangorestframework-gis
|
||||
gevent
|
||||
gunicorn
|
||||
phonenumbers
|
||||
psycopg2-binary
|
||||
python-memcached
|
||||
raven
|
||||
|
||||
@ -4,53 +4,53 @@
|
||||
#
|
||||
# pip-compile --output-file=requirements/base.txt requirements/base.in
|
||||
#
|
||||
babel==2.6.0 # via django-phonenumber-field
|
||||
boto3==1.9.12
|
||||
babel==2.7.0 # via django-phonenumber-field
|
||||
boto3==1.9.211
|
||||
boto==2.49.0
|
||||
botocore==1.12.12 # via boto3, s3transfer
|
||||
certifi==2018.8.24 # via requests
|
||||
botocore==1.12.211 # via boto3, s3transfer
|
||||
certifi==2019.6.16 # via requests
|
||||
chardet==3.0.4 # via requests
|
||||
django-anymail==4.2
|
||||
django-appconf==1.0.2
|
||||
django-autocomplete-light==3.3.2
|
||||
django-anymail==6.1.0
|
||||
django-appconf==1.0.3
|
||||
django-autocomplete-light==3.4.1
|
||||
django-avatar==4.1.0
|
||||
django-bootstrap3==11.0.0
|
||||
django-bootstrap3==11.1.0
|
||||
django-braces==1.13.0
|
||||
django-cas-server==1.1.0
|
||||
django-compressor==2.2
|
||||
django-countries==5.3.2
|
||||
django-compressor==2.3
|
||||
django-countries==5.4
|
||||
django-crispy-forms==1.7.2
|
||||
django-envelope==1.3
|
||||
django-extensions==2.1.2
|
||||
django-geojson==2.11.0
|
||||
django-extensions==2.2.1
|
||||
django-geojson==2.12.0
|
||||
django-leaflet==0.24.0
|
||||
django-multipleselectfield==0.2.0.post2
|
||||
django-multiupload==0.5.2
|
||||
django-phonenumber-field==2.0.1
|
||||
django-registration-redux==2.4
|
||||
django-phonenumber-field==3.0.1
|
||||
django-registration-redux==2.6
|
||||
django-storages==1.7.1
|
||||
django==2.1.1
|
||||
djangorestframework-gis==0.13
|
||||
djangorestframework==3.8.2
|
||||
docutils==0.14 # via botocore
|
||||
gevent==1.3.7
|
||||
django==2.1.11
|
||||
djangorestframework-gis==0.14
|
||||
djangorestframework==3.10.2
|
||||
docutils==0.15.2 # via botocore
|
||||
gevent==1.4.0
|
||||
greenlet==0.4.15 # via gevent
|
||||
gunicorn==19.9.0
|
||||
idna==2.7 # via requests
|
||||
jmespath==0.9.3 # via boto3, botocore
|
||||
lxml==4.3.3 # via django-cas-server
|
||||
phonenumbers==8.9.14 # via django-phonenumber-field
|
||||
pillow==5.2.0 # via django-avatar
|
||||
psycopg2-binary==2.7.6.1
|
||||
python-dateutil==2.7.3 # via botocore
|
||||
idna==2.8 # via requests
|
||||
jmespath==0.9.4 # via boto3, botocore
|
||||
lxml==4.4.1 # via django-cas-server
|
||||
phonenumbers==8.10.17
|
||||
pillow==6.1.0 # via django-avatar
|
||||
psycopg2-binary==2.8.3
|
||||
python-dateutil==2.8.0 # via botocore
|
||||
python-memcached==1.59
|
||||
pytz==2018.5 # via babel, django
|
||||
raven==6.9.0
|
||||
pytz==2019.2 # via babel, django
|
||||
raven==6.10.0
|
||||
rcssmin==1.0.6
|
||||
requests-futures==0.9.9 # via django-cas-server
|
||||
requests==2.19.1 # via django-anymail, django-cas-server, requests-futures
|
||||
rjsmin==1.0.12
|
||||
s3transfer==0.1.13 # via boto3
|
||||
six==1.11.0 # via django-anymail, django-cas-server, django-extensions, django-geojson, djangorestframework-gis, python-dateutil, python-memcached
|
||||
urllib3==1.23 # via botocore, requests
|
||||
whitenoise==4.1
|
||||
requests-futures==1.0.0 # via django-cas-server
|
||||
requests==2.22.0 # via django-anymail, django-cas-server, requests-futures
|
||||
rjsmin==1.1.0
|
||||
s3transfer==0.2.1 # via boto3
|
||||
six==1.12.0 # via django-anymail, django-appconf, django-cas-server, django-extensions, django-geojson, python-dateutil, python-memcached
|
||||
urllib3==1.25.3 # via botocore, requests
|
||||
whitenoise==4.1.3
|
||||
|
||||
@ -1,11 +1,24 @@
|
||||
bpython
|
||||
isort
|
||||
prospector
|
||||
-r ./base.in
|
||||
|
||||
flake8
|
||||
coverage
|
||||
pre-commit
|
||||
pip-tools
|
||||
|
||||
# Code quality
|
||||
# ------------------------------------------------------------------------------
|
||||
mypy # https://github.com/python/mypy
|
||||
flake8 # https://github.com/PyCQA/flake8
|
||||
black # https://github.com/black/black
|
||||
coverage # https://github.com/nedbat/coveragepy
|
||||
pre-commit # https://pre-commit.com/
|
||||
|
||||
# Django
|
||||
# ------------------------------------------------------------------------------
|
||||
django-debug-toolbar
|
||||
|
||||
black
|
||||
pip-tools
|
||||
# Testing
|
||||
# ------------------------------------------------------------------------------
|
||||
django-override-storage
|
||||
django_coverage_plugin
|
||||
pytest
|
||||
pytest-cov
|
||||
pytest-django
|
||||
selenium
|
||||
|
||||
@ -6,52 +6,91 @@
|
||||
#
|
||||
appdirs==1.4.3 # via black
|
||||
aspy.yaml==1.3.0 # via pre-commit
|
||||
astroid==2.0.4 # via pylint, requirements-detector
|
||||
attrs==19.1.0 # via black
|
||||
atomicwrites==1.3.0 # via pytest
|
||||
attrs==19.1.0 # via black, packaging, pytest
|
||||
babel==2.7.0 # via django-phonenumber-field
|
||||
black==19.3b0
|
||||
blessings==1.7 # via curtsies
|
||||
bpython==0.17.1
|
||||
certifi==2018.8.24 # via requests
|
||||
boto3==1.9.211
|
||||
boto==2.49.0
|
||||
botocore==1.12.211 # via boto3, s3transfer
|
||||
certifi==2019.6.16 # via requests
|
||||
cfgv==2.0.1 # via pre-commit
|
||||
chardet==3.0.4 # via requests
|
||||
click==7.0 # via black, pip-tools
|
||||
coverage==4.5.4
|
||||
curtsies==0.3.0 # via bpython
|
||||
django-anymail==6.1.0
|
||||
django-appconf==1.0.3
|
||||
django-autocomplete-light==3.4.1
|
||||
django-avatar==4.1.0
|
||||
django-bootstrap3==11.1.0
|
||||
django-braces==1.13.0
|
||||
django-cas-server==1.1.0
|
||||
django-compressor==2.3
|
||||
django-countries==5.4
|
||||
django-coverage-plugin==1.6.0
|
||||
django-crispy-forms==1.7.2
|
||||
django-debug-toolbar==2.0
|
||||
django==2.2.4 # via django-debug-toolbar
|
||||
dodgy==0.1.9 # via prospector
|
||||
flake8-polyfill==1.0.2 # via pep8-naming
|
||||
flake8==3.5.0
|
||||
greenlet==0.4.15 # via bpython
|
||||
django-envelope==1.3
|
||||
django-extensions==2.2.1
|
||||
django-geojson==2.12.0
|
||||
django-leaflet==0.24.0
|
||||
django-multipleselectfield==0.2.0.post2
|
||||
django-multiupload==0.5.2
|
||||
django-override-storage==0.1.6
|
||||
django-phonenumber-field==3.0.1
|
||||
django-registration-redux==2.6
|
||||
django-storages==1.7.1
|
||||
django==2.1.11
|
||||
djangorestframework-gis==0.14
|
||||
djangorestframework==3.10.2
|
||||
docutils==0.15.2 # via botocore
|
||||
entrypoints==0.3 # via flake8
|
||||
flake8==3.7.8
|
||||
gevent==1.4.0
|
||||
greenlet==0.4.15 # via gevent
|
||||
gunicorn==19.9.0
|
||||
identify==1.4.6 # via pre-commit
|
||||
idna==2.7 # via requests
|
||||
importlib-metadata==0.19 # via pre-commit
|
||||
isort==4.3.4
|
||||
lazy-object-proxy==1.3.1 # via astroid
|
||||
mccabe==0.6.1 # via flake8, prospector, pylint
|
||||
idna==2.8 # via requests
|
||||
importlib-metadata==0.19 # via pluggy, pre-commit, pytest
|
||||
jmespath==0.9.4 # via boto3, botocore
|
||||
lxml==4.4.1 # via django-cas-server
|
||||
mccabe==0.6.1 # via flake8
|
||||
more-itertools==7.2.0 # via pytest
|
||||
mypy-extensions==0.4.1 # via mypy
|
||||
mypy==0.720
|
||||
nodeenv==1.3.3 # via pre-commit
|
||||
pep8-naming==0.7.0 # via prospector
|
||||
packaging==19.1 # via pytest
|
||||
phonenumbers==8.10.17
|
||||
pillow==6.1.0 # via django-avatar
|
||||
pip-tools==4.0.0
|
||||
pluggy==0.12.0 # via pytest
|
||||
pre-commit==1.18.2
|
||||
prospector==1.1.2
|
||||
pycodestyle==2.3.1 # via flake8, prospector
|
||||
pydocstyle==2.1.1 # via prospector
|
||||
pyflakes==1.6.0 # via flake8, prospector
|
||||
pygments==2.2.0 # via bpython
|
||||
pylint-plugin-utils==0.4 # via prospector
|
||||
pylint==2.1.1 # via prospector, pylint-plugin-utils
|
||||
pytz==2019.2 # via django
|
||||
pyyaml==3.13 # via aspy.yaml, pre-commit, prospector
|
||||
requests==2.19.1 # via bpython
|
||||
requirements-detector==0.6 # via prospector
|
||||
setoptconf==0.2.0 # via prospector
|
||||
six==1.11.0 # via astroid, blessings, bpython, cfgv, pip-tools, pre-commit, pydocstyle
|
||||
snowballstemmer==1.2.1 # via pydocstyle
|
||||
sqlparse==0.3.0 # via django, django-debug-toolbar
|
||||
psycopg2-binary==2.8.3
|
||||
py==1.8.0 # via pytest
|
||||
pycodestyle==2.5.0 # via flake8
|
||||
pyflakes==2.1.1 # via flake8
|
||||
pyparsing==2.4.2 # via packaging
|
||||
pytest-cov==2.7.1
|
||||
pytest-django==3.5.1
|
||||
pytest==5.1.0
|
||||
python-dateutil==2.8.0 # via botocore
|
||||
python-memcached==1.59
|
||||
pytz==2019.2 # via babel, django
|
||||
pyyaml==5.1.2 # via aspy.yaml, pre-commit
|
||||
raven==6.10.0
|
||||
rcssmin==1.0.6
|
||||
requests-futures==1.0.0 # via django-cas-server
|
||||
requests==2.22.0 # via django-anymail, django-cas-server, requests-futures
|
||||
rjsmin==1.1.0
|
||||
s3transfer==0.2.1 # via boto3
|
||||
selenium==3.141.0
|
||||
six==1.12.0 # via cfgv, django-anymail, django-appconf, django-cas-server, django-coverage-plugin, django-extensions, django-geojson, packaging, pip-tools, pre-commit, python-dateutil, python-memcached
|
||||
sqlparse==0.3.0 # via django-debug-toolbar
|
||||
toml==0.10.0 # via black, pre-commit
|
||||
typing==3.6.6 # via curtsies
|
||||
urllib3==1.23 # via requests
|
||||
typed-ast==1.4.0 # via mypy
|
||||
typing-extensions==3.7.4 # via mypy
|
||||
urllib3==1.25.3 # via botocore, requests, selenium
|
||||
virtualenv==16.7.3 # via pre-commit
|
||||
wcwidth==0.1.7 # via curtsies
|
||||
wrapt==1.10.11 # via astroid
|
||||
wcwidth==0.1.7 # via pytest
|
||||
whitenoise==4.1.3
|
||||
zipp==0.5.2 # via importlib-metadata
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
django-override-storage
|
||||
django_coverage_plugin
|
||||
pytest
|
||||
pytest-cov
|
||||
pytest-django
|
||||
selenium
|
||||
@ -1,22 +0,0 @@
|
||||
#
|
||||
# This file is autogenerated by pip-compile
|
||||
# To update, run:
|
||||
#
|
||||
# pip-compile --output-file=requirements/test.txt requirements/test.in
|
||||
#
|
||||
atomicwrites==1.2.1 # via pytest
|
||||
attrs==18.2.0 # via pytest
|
||||
coverage==4.5.1 # via django-coverage-plugin, pytest-cov
|
||||
django-coverage-plugin==1.6.0
|
||||
django-override-storage==0.1.6
|
||||
more-itertools==4.3.0 # via pytest
|
||||
pluggy==0.7.1 # via pytest
|
||||
py==1.6.0 # via pytest
|
||||
pytest-cov==2.6.0
|
||||
pytest-django==3.4.3
|
||||
pytest==3.8.1
|
||||
selenium==3.12.0
|
||||
six==1.11.0 # via django-coverage-plugin, more-itertools, pytest
|
||||
|
||||
# The following packages are considered to be unsafe in a requirements file:
|
||||
# setuptools==41.1.0 # via pytest
|
||||
Loading…
Reference in New Issue
Block a user