Skip to content

Commit

Permalink
Merge branch 'release/3.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
flibbertigibbet committed Jul 1, 2020
2 parents 60a7fa6 + 3b21e9c commit 260fb41
Show file tree
Hide file tree
Showing 5 changed files with 644 additions and 610 deletions.
4 changes: 2 additions & 2 deletions deployment/ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ postgresql_support_psycopg2_version: "2.8.*"

packer_version: "1.5.4"

nodejs_version: 12.17.0
nodejs_npm_version: 6.14.4
nodejs_version: 12.18.2
nodejs_npm_version: 6.14.5

otp_router: "default"

Expand Down
2 changes: 1 addition & 1 deletion python/cac_tripplanner/deployment_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
boto==2.49.0
PyYAML==5.3.1
majorkirby==1.0.0
requests==2.23.0
requests==2.24.0
troposphere==2.6.1
14 changes: 7 additions & 7 deletions python/cac_tripplanner/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
base58==2.0.0
boto3==1.13.19
Django==2.2.12
base58==2.0.1
boto3==1.14.13
Django==2.2.13
django-ckeditor==5.9.0
django-image-cropping==1.4.0
django-extensions==2.2.9
django-extensions==3.0.1
django-storages==1.9.1
easy-thumbnails==2.7
gunicorn==20.0.4
Pillow==7.1.2
Pillow==7.2.0
psycopg2-binary==2.8.5
pytz==2020.1
PyYAML==5.3.1
requests==2.23.0
requests==2.24.0
git+https://github.com/azavea/django-wpadmin@v2.2#egg=django-wpadmin
virtualenv==20.0.21
virtualenv==20.0.25
Loading

0 comments on commit 260fb41

Please sign in to comment.