diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e442be..14e8a1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,18 +8,17 @@ jobs: matrix: pg_version: [10, 12] env: - PG_VERSION: ${{ matrix.pg_version }} + PG_VERSION: ${{ matrix.pg_version }} steps: - uses: actions/checkout@v1 - name: Set CLOUDSDK_PYTHON path run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - - name: Set up docker registry - env: - SA_TO_USE: ${{ secrets.GCS }} - run: | - echo "${SA_TO_USE}" | base64 -d | docker login -u _json_key --password-stdin https://gcr.io + - name: Setup gcloud authentication + uses: google-github-actions/setup-gcloud@v0 + with: + service_account_key: ${{ secrets.GCS }} - name: Pull base image run: docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }} @@ -47,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 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/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 diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 11ea460..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.1', + version='0.24.2', description='CartoDB Services API Python Library',