From 8f3ceb7247920619f8b02ce1ff43f2e8727ca12a Mon Sep 17 00:00:00 2001 From: bednar Date: Fri, 10 Sep 2021 10:25:16 +0200 Subject: [PATCH 1/5] chore(ci): switch to next-gen CircleCI's convenience images --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 06b6664f..56d8ff0f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,8 +22,8 @@ commands: - restore_cache: name: Restoring Pip Cache keys: - - &cache-key pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }} - - pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>- + - &cache-key pip-cache-v10-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }} + - pip-cache-v10-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>- - run: command: | # use pipenv to install dependencies sudo pip install pipenv @@ -46,7 +46,7 @@ jobs: parameters: python-image: type: string - default: &default-python "circleci/python:3.6-buster" + default: &default-python "cimg/python:3.6" influxdb-image: type: string default: &default-influxdb "influxdb:latest" @@ -173,13 +173,13 @@ workflows: influxdb-image: "quay.io/influxdb/influxdb:nightly" - tests-python: name: test-3.7 - python-image: "circleci/python:3.7-buster" + python-image: "cimg/python:3.7" - tests-python: name: test-3.8 - python-image: "circleci/python:3.8-buster" + python-image: "cimg/python:3.8" - tests-python: name: test-3.9 - python-image: "circleci/python:3.9-buster" + python-image: "cimg/python:3.9" nightly: triggers: From 19bfe939c9762112448ca7f19d2fb21e42c6ec33 Mon Sep 17 00:00:00 2001 From: bednar Date: Fri, 10 Sep 2021 10:27:55 +0200 Subject: [PATCH 2/5] chore(ci): switch to next-gen CircleCI's convenience images --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56d8ff0f..319d96f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,9 @@ commands: keys: - &cache-key pip-cache-v10-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }} - pip-cache-v10-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>- - - run: - command: | # use pipenv to install dependencies - sudo pip install pipenv +# - run: +# command: | # use pipenv to install dependencies +# sudo pip install pipenv - run: name: "Running tests" command: ./scripts/ci-test.sh From e3395d4ee445522d52552295a1ac0d285eb2499b Mon Sep 17 00:00:00 2001 From: bednar Date: Fri, 10 Sep 2021 10:33:00 +0200 Subject: [PATCH 3/5] chore(ci): switch to next-gen CircleCI's convenience images --- .circleci/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 319d96f6..51054b24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,11 +22,8 @@ commands: - restore_cache: name: Restoring Pip Cache keys: - - &cache-key pip-cache-v10-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }} - - pip-cache-v10-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>- -# - run: -# command: | # use pipenv to install dependencies -# sudo pip install pipenv + - &cache-key pip-cache-v11-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }} + - pip-cache-v11-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>- - run: name: "Running tests" command: ./scripts/ci-test.sh @@ -93,6 +90,7 @@ jobs: - run: name: Checks that the description will render correctly on PyPI. command: | + pip install setuptools_rust --user pip install twine --user python setup.py sdist bdist_wheel twine check dist/* From ce2bcc5d62520575f362f91607258b481a9c8cad Mon Sep 17 00:00:00 2001 From: bednar Date: Fri, 10 Sep 2021 10:34:07 +0200 Subject: [PATCH 4/5] chore(ci): switch to next-gen CircleCI's convenience images --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51054b24..89c685e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ jobs: - run: name: Checks that the description will render correctly on PyPI. command: | - pip install setuptools_rust --user + pip install --upgrade pip pip install twine --user python setup.py sdist bdist_wheel twine check dist/* From b29d09d9963e262c443f506927fa410f36653bd1 Mon Sep 17 00:00:00 2001 From: bednar Date: Fri, 10 Sep 2021 10:35:40 +0200 Subject: [PATCH 5/5] docs: update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af167b66..e4072631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ ### Bug Fixes 1. [#321](https://github.com/influxdata/influxdb-client-python/pull/321): Fixes return type for dashboard when `include=properties` is used + +### CI +1. [#327](https://github.com/influxdata/influxdb-client-python/pull/327): Switch to next-gen CircleCI's convenience images ## 1.20.0 [2021-08-20]