-
Notifications
You must be signed in to change notification settings - Fork 0
Conversation
Also updated all Django plugins to the most recent versions compatible with Django 1.11
I tried the suggestion of switching to .union() but that made tests fail due to different semantics, so I decided to leave it as-is.
Closes #879
e95e4df
to
ca8dd1d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After destroying the VM and running ./scripts/setup
, docker-compose
seems to be unavailable inside the new VM.
vagrant@vagrant-ubuntu-trusty-64:~/climate-change-api$ ./scripts/update
./scripts/update: line 59: docker-compose: command not found
@@ -4,9 +4,6 @@ | |||
|
|||
|
|||
class CityAdmin(admin.GeoModelAdmin): | |||
# TODO (GH #411): This can be removed when upgrading to Django 1.11 | |||
openlayers_url = 'https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎊
@@ -185,8 +188,6 @@ def map_cells_for_lat_lon(self, lat, lon, distance=0): | |||
""" | |||
map_cells = self._map_cells_at_lat_lon(lat, lon) | |||
if distance > 0: | |||
# TODO (GH #411): This would be better as map_cells = map_cells.union(...) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎆
I was able to replicate the issue with
This causes provisioning to fail before it gets to installing |
Fixes issues installing urllib3[secure]
@flibbertigibbet I was able to replicate the issue you encountered and fix it by upgrading the Vagrant VM to a newer version in 488efd1 I then encountered a different error in provisioning the PostgreSQL APT keys which I |
deployment/ansible/roles/cc-api.postgresql-client/tasks/main.yml
Outdated
Show resolved
Hide resolved
Fixes apt_key SSL issues
d9260d7
to
5bb5760
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only issues I encountered in testing the API with either the lab or in Temperate were related to having outdated fixtures. Manually adding scenario
alias
text and running generate_historic
instead of using fixtures was enough to work around the fixture issues.
Overview
This PR upgrades to Django 1.11 and Python 3.6, and additionally updates a variety of Django related dependencies.
Demo
N/A
Notes
I wasn't originally intending to update Python at the same time as Django, but we don't have any Django 1.11 / Python 3.5 Docker images so I updated Python at the same time, which doesn't seem to have caused any fallout.
As these updates touch every part of the application, I added support for generating code coverage reports so I could determine which parts of the application were covered by the automated test suite and which needed more dedicated manual testing. Based on that, I manually tested the following parts of the application:
/city
,/city/<pk>/
and/city/<pk>/map-cell/
endpointsI still need to test email and static file hosting in the staging environment (I was unable to test these locally).
I intentionally didn't go any further with adding code coverage past being able to use it locally. If we want to add integration with Jenkins or an external service I'd like to add that in later.
Testing Instructions
scripts/update
scripts/test
should generate anhtmlcov
directory with code coverage resultsChecklist
[ ] Has the API documentation been updated, or does this PR not require it?Closes #411
Closes #879