From 5f73407edcc084b25bf4c96e4244a640ca349722 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Thu, 26 Jan 2017 13:33:06 -0500 Subject: [PATCH 1/5] Bump package versions To fix deploy. --- deployment/ansible/group_vars/all | 4 +++- .../cac-tripplanner.app/defaults/main.yml | 22 +++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index b042fa0d5..1e9b4f38b 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -3,7 +3,9 @@ app_username: "vagrant" packer_version: "0.7.5" -nodejs_version: 4.6.0 +nodejs_version: 4.6.2 + +virtualenv_version: 15.1.0 otp_router: "default" diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml index ac1a0124b..2acd2cfea 100644 --- a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml +++ b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml @@ -20,18 +20,18 @@ root_media_dir: "/media/cac" app_cron_event_feed: "cd {{ root_app_dir }} && python manage.py load_events >> {{ app_cron_event_feed_log }} 2>&1" cac_python_dependencies: - - { name: 'base58', version: '0.2.3' } - - { name: 'boto', version: '2.41.0' } - - { name: 'django', version: '1.8.13' } - - { name: 'django-ckeditor', version: '5.0.3' } - - { name: 'django-extensions', version: '1.6.7' } + - { name: 'base58', version: '0.2.4' } + - { name: 'boto', version: '2.45.0' } + - { name: 'django', version: '1.8.17' } + - { name: 'django-ckeditor', version: '5.1.1' } + - { name: 'django-extensions', version: '1.7.5' } - { name: 'django-storages-redux', version: '1.3.2' } - - { name: 'gunicorn', version: '19.6.0'} - - { name: 'ipython', version: '4.2.1' } - - { name: 'pillow', version: '3.3.0' } - - { name: 'psycopg2', version: '2.6.1' } - - { name: 'pytz', version: '2016.4' } - - { name: 'pyyaml', version: '3.11' } + - { name: 'gunicorn', version: '19.6.0' } + - { name: 'ipython', version: '5.1.0' } + - { name: 'pillow', version: '3.4.2' } + - { name: 'psycopg2', version: '2.6.2' } + - { name: 'pytz', version: '2016.10' } + - { name: 'pyyaml', version: '3.12' } - { name: 'troposphere', version: '0.7.2'} # Note: django-wpadmin is installed manually to work around the fact that ansible-pip # ignores editable=False From cbb3a5d334a9dd05f2df525a4c6936a08061d29d Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Thu, 26 Jan 2017 14:51:11 -0500 Subject: [PATCH 2/5] Bump ansible-opentripplanner role version Fix Java package version for provision. --- deployment/ansible/roles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml index 53875a9c9..8ff944241 100644 --- a/deployment/ansible/roles.yml +++ b/deployment/ansible/roles.yml @@ -5,7 +5,7 @@ version: 0.2.6 - src: azavea.opentripplanner - version: 1.0.3 + version: 1.0.4 - src: azavea.nginx version: 0.2.2 From db0388ebd905de3f47e75c69d7782fd5b4891436 Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Fri, 27 Jan 2017 14:07:13 -0500 Subject: [PATCH 3/5] Remove ipython Has setuptools as a dependency, which causes issues. --- deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml index 2acd2cfea..f7fa4fc3f 100644 --- a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml +++ b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml @@ -27,7 +27,6 @@ cac_python_dependencies: - { name: 'django-extensions', version: '1.7.5' } - { name: 'django-storages-redux', version: '1.3.2' } - { name: 'gunicorn', version: '19.6.0' } - - { name: 'ipython', version: '5.1.0' } - { name: 'pillow', version: '3.4.2' } - { name: 'psycopg2', version: '2.6.2' } - { name: 'pytz', version: '2016.10' } From 740aaefb318aa7411a7fe0f53ba7e963c4867b0e Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Mon, 30 Jan 2017 11:40:00 -0500 Subject: [PATCH 4/5] Fix linter warning Rename variable to be pythonic. --- python/cac_tripplanner/destinations/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/cac_tripplanner/destinations/views.py b/python/cac_tripplanner/destinations/views.py index ccfeb3e05..d326af8ae 100644 --- a/python/cac_tripplanner/destinations/views.py +++ b/python/cac_tripplanner/destinations/views.py @@ -145,7 +145,7 @@ def get(self, request, *args, **kwargs): results = [] if lat and lon: try: - searchPoint = Point(float(lon), float(lat)) + search_point = Point(float(lon), float(lat)) except ValueError as e: error = json.dumps({ 'msg': 'Invalid latitude/longitude pair', @@ -153,7 +153,7 @@ def get(self, request, *args, **kwargs): }) return HttpResponse(error, 'application/json') results = (Destination.objects.filter(published=True) - .distance(searchPoint) + .distance(search_point) .order_by('distance')) elif text is not None: results = Destination.objects.filter(published=True, name__icontains=text) From e8debcc62f38a89970c430da2cca3f6cc5074e8b Mon Sep 17 00:00:00 2001 From: Kathryn Killebrew Date: Mon, 30 Jan 2017 12:24:34 -0500 Subject: [PATCH 5/5] Update ansible pip role Should fix setuptools issues. --- deployment/ansible/roles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml index 8ff944241..19a2bf356 100644 --- a/deployment/ansible/roles.yml +++ b/deployment/ansible/roles.yml @@ -20,7 +20,7 @@ version: 1.1.1 - src: azavea.pip - version: 0.1.1 + version: 1.0.0 - src: azavea.python version: 0.1.0