From 37d72b333a9cf08fb346fe3192aba0e844341c3e Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 08:18:20 +0200 Subject: [PATCH 1/8] Change HERE batch endpoint --- .../cartodb_services/cartodb_services/here/bulk_geocoder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d527b10f22f8bb7c3574eee0ce348abeda30cc38 Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 09:18:30 +0200 Subject: [PATCH 2/8] Define CLOUDSDK_PYTHON environment variable --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68ed2c8..88ad2fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,9 @@ jobs: - name: Copy ci files to root run: cp ci-tools/repos/${{ github.event.repository.name }}/* . + - name: Define CLOUDSDK_PYTHON environment variable + run: export CLOUDSDK_PYTHON=/usr/bin/python + - name: Start docker-compose services run: docker-compose -f docker-compose.yaml up -d From dbb7248f67cfcde47f0019c0f1c38bd09eac787d Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 09:44:04 +0200 Subject: [PATCH 3/8] hardcode GCP version --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88ad2fc..525d862 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,7 @@ jobs: - name: Setup gcloud authentication uses: GoogleCloudPlatform/github-actions/setup-gcloud@master + version: '300.0.0' with: service_account_key: ${{ secrets.GCS }} @@ -30,9 +31,6 @@ jobs: - name: Copy ci files to root run: cp ci-tools/repos/${{ github.event.repository.name }}/* . - - name: Define CLOUDSDK_PYTHON environment variable - run: export CLOUDSDK_PYTHON=/usr/bin/python - - name: Start docker-compose services run: docker-compose -f docker-compose.yaml up -d From 95bd089366ccbb66ae7bbd87c5dd9e44b1876a7f Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 09:46:06 +0200 Subject: [PATCH 4/8] hardcode GCP version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 525d862..52991f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,8 @@ jobs: - name: Setup gcloud authentication uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - version: '300.0.0' with: + version: '300.0.0' service_account_key: ${{ secrets.GCS }} - name: Pull base image From b793c02415d2ed934a9ce61d1e7d1d35056b114f Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 09:56:28 +0200 Subject: [PATCH 5/8] hardcode GCP version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52991f0..f8ba5ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - name: Setup gcloud authentication uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: - version: '300.0.0' + version: '299.0.0' service_account_key: ${{ secrets.GCS }} - name: Pull base image From 7f87fc2e256a7be0ea52046916ebd0b38121c00a Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 10:16:46 +0200 Subject: [PATCH 6/8] Define CLOUDSDK_PYTHON environment variable --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8ba5ab..42cd30e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,10 +12,12 @@ 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: - version: '299.0.0' service_account_key: ${{ secrets.GCS }} - name: Pull base image From 2a1d751cf57b57f9f925353a177a2b468bc96e36 Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 10:57:15 +0200 Subject: [PATCH 7/8] Change city for geocoding --- test/integration/test_street_functions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) From 0f8e946461db104c0fda8e9c98f29d70d0aa8b9a Mon Sep 17 00:00:00 2001 From: antoniocarlon Date: Wed, 23 Sep 2020 11:33:47 +0200 Subject: [PATCH 8/8] Bump Python library version --- NEWS.md | 5 +++++ server/lib/python/cartodb_services/setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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/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',