From 8ea2ec39a1bf82292dbd7271bbee8037f75a7b42 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Mon, 6 Nov 2023 13:00:16 +0100 Subject: [PATCH 1/3] Remove outdated poetry option --- .github/workflows/ci_cd.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 02653511d9..e882ecbc99 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -50,9 +50,6 @@ jobs: pip-${{ runner.os }} # pre-commit needs all dev dependencies, since it also checks the test and example files - # TODO: remove 'poetry config installer.modern-installation false' once we use a pydata-sphinx-theme - # version where https://github.com/pydata/pydata-sphinx-theme/issues/1253 is resolved. - # The same needs to be removed in the README. - name: Install library, with all optional groups run: | git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-acp".insteadOf "https://github.com/ansys-internal/ansys-api-acp" @@ -60,7 +57,6 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" pip install poetry - poetry config installer.modern-installation false poetry install --with dev,test - name: Install custom API branch if needed From 057f126e700a24efd4060eb24ca148b6e5b7d127 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Mon, 6 Nov 2023 13:12:30 +0100 Subject: [PATCH 2/3] Update pip in CI --- .github/workflows/ci_cd.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index e882ecbc99..e0d4ff309a 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -56,6 +56,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" + pip install -U pip pip install poetry poetry install --with dev,test @@ -100,6 +101,7 @@ jobs: run: | git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-acp".insteadOf "https://github.com/ansys-internal/ansys-api-acp" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" + pip install -U pip pip install poetry poetry build @@ -145,6 +147,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" + pip install -U pip pip install poetry poetry install --with test @@ -226,6 +229,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" + pip install -U pip pip install poetry poetry install --with dev From cb95b9686374635aca3716c45078e7fef4a6c77b Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Mon, 6 Nov 2023 13:19:02 +0100 Subject: [PATCH 3/3] Disallow poetry version 1.7.0 --- .github/workflows/ci_cd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index e0d4ff309a..83fd10b5e8 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -57,7 +57,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" pip install -U pip - pip install poetry + pip install 'poetry!=1.7.0' poetry install --with dev,test - name: Install custom API branch if needed @@ -102,7 +102,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-acp".insteadOf "https://github.com/ansys-internal/ansys-api-acp" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" pip install -U pip - pip install poetry + pip install 'poetry!=1.7.0' poetry build - name: Validate packages @@ -148,7 +148,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" pip install -U pip - pip install poetry + pip install 'poetry!=1.7.0' poetry install --with test - name: Install custom API branch if needed @@ -230,7 +230,7 @@ jobs: git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-api-tools-filetransfer".insteadOf "https://github.com/ansys-internal/ansys-api-tools-filetransfer" git config --global url."https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys-internal/ansys-tools-local-product-launcher".insteadOf "https://github.com/ansys-internal/ansys-tools-local-product-launcher" pip install -U pip - pip install poetry + pip install 'poetry!=1.7.0' poetry install --with dev - name: Install custom API branch if needed