Skip to content

Commit

Permalink
Dependency update (#2027)
Browse files Browse the repository at this point in the history
- Django (1.11.12)
- djangorestframework (3.8.2)
- django-countries (5.3)
- simplejson (3.14.0)
- django-widget-tweaks (1.4.2)
- Pillow (5.1.0)
- openpyxl (2.5.3)
- pytz (2018.4)
- awscli (1.15.8)
- twilio (6.12.1)
- phonenumbers (8.9.4)
- libsass (0.14.4)
- pytest-django (3.2.1)
- transifex-client (0.13.2)
- tox (3.0.0)
- django-extensions (2.0.7)
- ipython (6.3.1)
- raven (6.7.0)
- pytest (3.5.1)

Further, need to restrict `django-simple-history` to 1.9.0 because it requires us to switch from the old-style `MIDDLEWARE_CLASSES` setting to the new `MIDDLEWARE`.

`django-audit-log`, however, is not yet compatible with `MIDDLEWARE`. There's a PR providing a fix, but is has not yet been released.
  • Loading branch information
oliverroick authored Apr 25, 2018
1 parent 5c4be2a commit 7f87ae4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
26 changes: 13 additions & 13 deletions requirements/common.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Django==1.11.11 # rq.filter: <2.0
djangorestframework==3.7.7
Django==1.11.12 # rq.filter: <2.0
djangorestframework==3.8.2
psycopg2==2.7.4
djoser==1.1.5
django-allauth==0.35.0
Expand All @@ -8,7 +8,7 @@ django-filter==1.1.0
django-crispy-forms==1.7.2
django-parsley==0.7
django-formtools==2.1
django-countries==5.2
django-countries==5.3
django-leaflet==0.18.1 # rq.filter: <=0.18.1
django-sass-processor==0.6
djangorestframework-gis==0.12
Expand All @@ -18,20 +18,20 @@ rfc3987==1.3.7
drfdocs-cadasta==0.0.12
django-tutelary==0.1.22
django-audit-log==0.7.0
django-simple-history==1.9.0
simplejson==3.13.2
django-widget-tweaks==1.4.1
django-simple-history==1.9.0 # rq.filter: <0.2
simplejson==3.14.0
django-widget-tweaks==1.4.2
django-buckets==0.1.24.post1
pyxform-cadasta==0.9.22
python-magic==0.4.15
Pillow==5.0.0
Pillow==5.1.0
django-jsonattrs==0.1.25
openpyxl==2.5.1
pytz==2018.3
openpyxl==2.5.3
pytz==2018.4
shapely==1.6.4.post1
gdal==1.10.0 # rq.filter: <1.11.0
pylibmc==1.5.2
awscli==1.14.63
awscli==1.15.8
pandas==0.22.0
argon2-cffi==18.1.0
requests==2.18.4
Expand All @@ -40,9 +40,9 @@ django-compressor==2.2
beautifulsoup4==4.6.0
gpxpy==1.2.0
django-otp==0.4.3
twilio==6.11.0
phonenumbers==8.9.2
twilio==6.12.1
phonenumbers==8.9.4
cadasta-workertoolbox==0.6.0
git+https://github.com/celery/kombu@0f4da # TODO: update to 4.1.1+ when released
pybreaker==0.4.2
libsass==0.14.2
libsass==0.14.4
10 changes: 5 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
-r common.txt
pytest-django==3.1.2
pytest-django==3.2.1
factory-boy==2.10.0
pytest-cov==2.5.1
selenium==3.11.0
transifex-client==0.13.1
tox==2.9.1
transifex-client==0.13.2
tox==3.0.0
flake8==3.5.0
django-debug-toolbar==1.9.1
django-extensions==2.0.6
django-extensions==2.0.7
django-skivvy==0.1.10
ipython==6.2.1
ipython==6.3.1
git+https://github.com/Cadasta/[email protected]
2 changes: 1 addition & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
raven==6.6.0
raven==6.7.0
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ install_command = pip install --find-links https://s3.amazonaws.com:443/cadasta-
[testenv:py35-flake8]
commands = ./runtests.py --lint
deps =
pytest==3.5.0
pytest==3.5.1
flake8==3.5.0

[testenv:py35-django-migration]
Expand Down

0 comments on commit 7f87ae4

Please sign in to comment.