diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68ed2c8..42cd30e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,6 +12,9 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Set CLOUDSDK_PYTHON path + run: echo '::set-env name=CLOUDSDK_PYTHON::/usr/bin/python' + - name: Setup gcloud authentication uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: diff --git a/NEWS.md b/NEWS.md index e5d4bc9..5ca694e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +Sep 23th, 2020 +============== +* Version `0.23.3` of the Python library + * Change HERE batch geocoding URL + Apr 7th, 2020 ============= * Version `0.30.0` of the client extension diff --git a/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py b/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py index 0da38fa..ad71bfe 100644 --- a/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py +++ b/server/lib/python/cartodb_services/cartodb_services/here/bulk_geocoder.py @@ -18,7 +18,7 @@ HereJobStatus = namedtuple('HereJobStatus', 'total_count processed_count status' class HereMapsBulkGeocoder(HereMapsGeocoder, StreetPointBulkGeocoder): MAX_BATCH_SIZE = 1000000 # From the docs MIN_BATCHED_SEARCH = 100 # Under this, serial will be used - BATCH_URL = 'https://batch.geocoder.cit.api.here.com/6.2/jobs' + BATCH_URL = 'https://batch.geocoder.api.here.com/6.2/jobs' # https://developer.here.com/documentation/batch-geocoder/topics/read-batch-request-output.html META_COLS = ['relevance', 'matchType', 'matchCode', 'matchLevel', 'matchQualityStreet'] MAX_STALLED_RETRIES = 100 diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 30e60e2..13342d5 100644 --- a/server/lib/python/cartodb_services/setup.py +++ b/server/lib/python/cartodb_services/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages setup( name='cartodb_services', - version='0.23.2', + version='0.23.3', description='CartoDB Services API Python Library', diff --git a/test/integration/test_street_functions.py b/test/integration/test_street_functions.py index 2350ff5..54bf39e 100644 --- a/test/integration/test_street_functions.py +++ b/test/integration/test_street_functions.py @@ -280,18 +280,18 @@ class TestBulkStreetFunctions(TestStreetFunctionsSetUp): def test_templating_geocoding(self): query = "SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \ "cdb_dataservices_client.cdb_bulk_geocode_street_point(" \ - "'select 1 as cartodb_id, ''Logroño'' as city', " \ + "'select 1 as cartodb_id, ''Valladolid'' as city', " \ "'city || '', '' || ''Spain''') " \ "UNION " \ "SELECT cartodb_id, st_x(the_geom), st_y(the_geom) from " \ "cdb_dataservices_client.cdb_bulk_geocode_street_point(" \ - "'select 2 as cartodb_id, ''Logroño'' as city', " \ - "'city || '', '' || ''Argentina''')" + "'select 2 as cartodb_id, ''Valladolid'' as city', " \ + "'city || '', '' || ''Mexico''')" response = self._run_authenticated(query) points_by_cartodb_id = { - 1: self.fixture_points['Logroño, Spain'], - 2: self.fixture_points['Logroño, Argentina'] + 1: self.fixture_points['Valladolid, Spain'], + 2: self.fixture_points['Valladolid, Mexico'] } self.assert_close_points(self._x_y_by_cartodb_id(response), points_by_cartodb_id)