Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

requirements: Update Django to 2.2 LTS #1281

Merged
merged 1 commit into from
Apr 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cove_360/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
SECRET_KEY = settings.SECRET_KEY
DEBUG = settings.DEBUG
ALLOWED_HOSTS = settings.ALLOWED_HOSTS
MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
MIDDLEWARE = settings.MIDDLEWARE
ROOT_URLCONF = settings.ROOT_URLCONF
TEMPLATES = settings.TEMPLATES
WSGI_APPLICATION = settings.WSGI_APPLICATION
Expand Down
2 changes: 1 addition & 1 deletion cove_iati/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
SECRET_KEY = settings.SECRET_KEY
DEBUG = settings.DEBUG
ALLOWED_HOSTS = settings.ALLOWED_HOSTS
MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
MIDDLEWARE = settings.MIDDLEWARE
ROOT_URLCONF = settings.ROOT_URLCONF
TEMPLATES = settings.TEMPLATES
WSGI_APPLICATION = settings.WSGI_APPLICATION
Expand Down
8 changes: 4 additions & 4 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Django<1.12
Django>2.2<2.3
#^^ rq.filter: <1.12
flattentool>=0.11.0
libcove>=0.16.1
-e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.12.0#egg=libcoveweb
libcove>=0.17.0
-e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.14.0#egg=libcoveweb
django-bootstrap3
django-debug-toolbar
requests
cached-property
dealer==2.0.5
dealer
django-environ
zipp==1.2.0
jsonschema
Expand Down
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Django==1.11.29 # rq.filter: <1.12
Django==2.2.12 # rq.filter: <1.12
flattentool==0.11.0
libcove==0.16.1
-e git+https://github.com/OpenDataServices/lib-cove-web.git@36ad4df14916d7be28b2c1332427ad5140b35ed5#egg=libcoveweb
libcove==0.17.0
-e git+https://github.com/OpenDataServices/lib-cove-web.git@73654b76161dabe1d406cd28f8aca7fd94dceafb#egg=libcoveweb
django-bootstrap3==12.0.3
django-debug-toolbar==2.2
requests==2.23.0
cached-property==1.5.1
dealer==2.0.5
dealer==2.1.0
django-environ==0.4.5
zipp==1.2.0
jsonschema==3.2.0
Expand All @@ -25,7 +25,7 @@ attrs==19.3.0
certifi==2020.4.5.1
chardet==3.0.4
commonmark==0.9.1
contextlib2==0.5.5
contextlib2==0.6.0.post1
defusedxml==0.6.0
et-xmlfile==1.0.1
idna==2.9
Expand All @@ -35,11 +35,11 @@ jsonref==0.2
LEPL==5.1.3
lxml==4.5.0
odfpy==1.4.1

pyrsistent==0.16.0
pytz==2019.3
schema==0.7.1
pytz==2020.1
schema==0.7.2
sentry-sdk==0.14.3
six==1.14.0
sqlparse==0.3.1
urllib3==1.25.8
urllib3==1.25.9
webencodings==0.5.1
25 changes: 13 additions & 12 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Django==1.11.29 # rq.filter: <1.12
Django==2.2.12 # rq.filter: <1.12
flattentool==0.11.0
libcove==0.16.1
-e git+https://github.com/OpenDataServices/lib-cove-web.git@36ad4df14916d7be28b2c1332427ad5140b35ed5#egg=libcoveweb
libcove==0.17.0
-e git+https://github.com/OpenDataServices/lib-cove-web.git@73654b76161dabe1d406cd28f8aca7fd94dceafb#egg=libcoveweb
django-bootstrap3==12.0.3
django-debug-toolbar==2.2
requests==2.23.0
cached-property==1.5.1
dealer==2.0.5
dealer==2.1.0
django-environ==0.4.5
zipp==1.2.0
jsonschema==3.2.0
Expand All @@ -30,9 +30,9 @@ pytest-localserver==0.5.0
pytest-xdist==1.31.0
coveralls==2.0.0
selenium==3.141.0
transifex-client==0.13.8
transifex-client==0.13.9
libsass==0.19.4
Sphinx==3.0.0
Sphinx==3.0.3
recommonmark==0.6.0
sphinx-rtd-theme==0.4.3
# Lock as later versions have a problem with slow generation of data
Expand All @@ -47,7 +47,7 @@ Babel==2.8.0
certifi==2020.4.5.1
chardet==3.0.4
commonmark==0.9.1
contextlib2==0.5.5
contextlib2==0.6.0.post1
defusedxml==0.6.0
docopt==0.6.2
docutils==0.16
Expand All @@ -58,7 +58,7 @@ idna==2.9
imagesize==1.2.0
importlib-metadata==1.6.0
jdcal==1.4.1
Jinja2==2.11.1
Jinja2==2.11.2
jsonref==0.2
LEPL==5.1.3
lxml==4.5.0
Expand All @@ -67,7 +67,7 @@ mccabe==0.6.1
more-itertools==8.2.0
odfpy==1.4.1
packaging==20.3

pathlib2==2.3.5
pluggy==0.13.1
py==1.8.1
pycodestyle==2.5.0
Expand All @@ -77,8 +77,9 @@ pyparsing==2.4.7
pyrsistent==0.16.0
pytest-forked==1.1.3
python-slugify==1.2.6
pytz==2019.3
schema==0.7.1
pytz==2020.1
schema==0.7.2
sentry-sdk==0.14.3
six==1.14.0
snowballstemmer==2.0.0
sphinxcontrib-applehelp==1.0.2
Expand All @@ -89,7 +90,7 @@ sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.4
sqlparse==0.3.1
Unidecode==1.1.1
urllib3==1.25.8
urllib3==1.25.9
wcwidth==0.1.9
webencodings==0.5.1
Werkzeug==1.0.1