From c7ed86072ba0dded26aeeecf3a60746145f8fe74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Thu, 1 Sep 2022 13:30:08 +0200 Subject: [PATCH 1/7] Fix parameter for new HERE Isolines API --- .../python/cartodb_services/cartodb_services/here/routing.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/here/routing.py b/server/lib/python/cartodb_services/cartodb_services/here/routing.py index 2b72ff9..c5e3f3d 100644 --- a/server/lib/python/cartodb_services/cartodb_services/here/routing.py +++ b/server/lib/python/cartodb_services/cartodb_services/here/routing.py @@ -345,6 +345,9 @@ class HereMapsRoutingIsolineV8(Traceable): mode_params.update({'routingmode': mode_type}) if not ('mode_traffic' in options and options['mode_traffic'] == 'enabled'): - mode_params.update({'departuretime': 'any'}) + if 'is_destination' in options and options['is_destination'].lower() == 'true': + mode_params.update({'arrivaltime': 'any'}) + else: + mode_params.update({'departuretime': 'any'}) return mode_params From 8caa73526273cf137c05ff3dba0183ec5c500825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Thu, 1 Sep 2022 15:27:28 +0200 Subject: [PATCH 2/7] fix action --- .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 bb9b891..7888891 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - name: Setup gcloud authentication - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master + uses: GoogleCloudPlatform/github-actions/setup-gcloud@v0 with: service_account_key: ${{ secrets.GCS }} From 10a34da23253fc38a6d69205815c03779a874f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Thu, 1 Sep 2022 15:31:46 +0200 Subject: [PATCH 3/7] trying to fix action --- .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 7888891..67ecb72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - name: Setup gcloud authentication - uses: GoogleCloudPlatform/github-actions/setup-gcloud@v0 + uses: 'google-github-actions/setup-gcloud@v0' with: service_account_key: ${{ secrets.GCS }} From 2819382dd0e73e027c1a3c89093de4d5e3890f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Thu, 1 Sep 2022 15:38:01 +0200 Subject: [PATCH 4/7] fixing CI --- .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 67ecb72..e2a6e8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - name: Setup gcloud authentication - uses: 'google-github-actions/setup-gcloud@v0' + uses: 'google-github-actions/setup-gcloud@v0.6.0' with: service_account_key: ${{ secrets.GCS }} From 063cac1b6599fc9e5d944517c774ace0dba00c85 Mon Sep 17 00:00:00 2001 From: alberhander Date: Thu, 1 Sep 2022 16:15:30 +0200 Subject: [PATCH 5/7] try fix CI --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2a6e8e..5a51ac5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: matrix: pg_version: [10, 12] env: - PG_VERSION: ${{ matrix.pg_version }} + PG_VERSION: ${{ matrix.pg_version }} steps: - uses: actions/checkout@v1 @@ -16,7 +16,7 @@ jobs: run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - name: Setup gcloud authentication - uses: 'google-github-actions/setup-gcloud@v0.6.0' + uses: google-github-actions/setup-gcloud@v0 with: service_account_key: ${{ secrets.GCS }} @@ -46,9 +46,9 @@ jobs: - name: Run python library tests run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && MAPBOX_API_KEY=$MAPBOX_API_KEY TOMTOM_API_KEY=$TOMTOM_API_KEY GEOCODIO_API_KEY=$GEOCODIO_API_KEY nosetests lib/python/cartodb_services/test" env: - MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }} - TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }} - GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }} + MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }} + TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }} + GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }} timeout-minutes: 5 - name: Run server tests From 86c10f0ca521514f7a079aa4fdf636c314715704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Fri, 2 Sep 2022 11:42:16 +0200 Subject: [PATCH 6/7] Bump version --- server/lib/python/cartodb_services/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 11ea460..ad831df 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.24.1', + version='0.24.2.dev', description='CartoDB Services API Python Library', From 6ce052072ced4e83aa3c73fe14b8eba9c5efbf2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Mon, 5 Sep 2022 13:23:56 +0200 Subject: [PATCH 7/7] Add changes for new server release --- 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 de5c432..be6069a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +Sep 5th, 2022 +============== +* Version `0.24.2` of the Python library + * Fix error calculating isolines with HERE + May 26th, 2021 ============== * Version `0.40.1` of the server extension diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index ad831df..57970a2 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.24.2.dev', + version='0.24.2', description='CartoDB Services API Python Library',