From 7bfcef162c1ddafb3ae846aedb1b0bc680903a5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:30:40 +0000 Subject: [PATCH 1/6] Bump ansys/actions from 7 to 8 Bumps [ansys/actions](https://github.com/ansys/actions) from 7 to 8. - [Release notes](https://github.com/ansys/actions/releases) - [Commits](https://github.com/ansys/actions/compare/v7...v8) --- updated-dependencies: - dependency-name: ansys/actions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3574e857..d94ffe35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Running documentation style checks" - uses: ansys/actions/doc-style@v7 + uses: ansys/actions/doc-style@v8 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v4 - name: "Set up Python" - uses: ansys/actions/_setup-python@v7 + uses: ansys/actions/_setup-python@v8 with: python-version: ${{ env.MAIN_PYTHON_VERSION }} use-cache: true @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Build library source and wheel artifacts" - uses: ansys/actions/build-library@v7 + uses: ansys/actions/build-library@v8 with: library-name: "pytwin" python-version: ${{ env.MAIN_PYTHON_VERSION }} @@ -112,7 +112,7 @@ jobs: uses: pyvista/setup-headless-display-action@v2 - name: Run pytest - uses: ansys/actions/tests-pytest@v7 + uses: ansys/actions/tests-pytest@v8 with: python-version: ${{ matrix.python-version }} pytest-extra-args: "--cov=pytwin --cov-report=term --cov-report=xml:.cov/coverage.xml --cov-report=html:.cov/html" @@ -134,7 +134,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Validate third party licenses" - uses: ansys/actions/check-licenses@v7 + uses: ansys/actions/check-licenses@v8 with: python-version: ${{ env.MAIN_PYTHON_VERSION }} @@ -145,7 +145,7 @@ jobs: if: github.event_name == 'push' && contains(github.ref, 'refs/tags') steps: - name: "Release to the public PyPI repository" - uses: ansys/actions/release-pypi-public@v7 + uses: ansys/actions/release-pypi-public@v8 with: library-name: "pytwin" twine-username: "__token__" @@ -159,7 +159,7 @@ jobs: if: github.ref == 'refs/heads/main' steps: - name: "Deploy the latest documentation" - uses: ansys/actions/doc-deploy-dev@v7 + uses: ansys/actions/doc-deploy-dev@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }} token: ${{ secrets.GITHUB_TOKEN }} @@ -171,7 +171,7 @@ jobs: if: github.event_name == 'push' && contains(github.ref, 'refs/tags') steps: - name: "Deploy the stable documentation" - uses: ansys/actions/doc-deploy-stable@v7 + uses: ansys/actions/doc-deploy-stable@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }} token: ${{ secrets.GITHUB_TOKEN }} From 27326f8e4e6d4e378024552ba47cbd0d89f97519 Mon Sep 17 00:00:00 2001 From: chrpetre <108675940+chrpetre@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:27:54 +0200 Subject: [PATCH 2/6] disabling windows test while pytest v8 is failing --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d94ffe35..b40480d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-20.04] + os: [ubuntu-20.04] + #os: [windows-latest, ubuntu-20.04] CP disabling windows testing while tests-pytest@v8 is not fixed python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Install Ubuntu dependencies for RomViewerSharedLib.so From 6b6b72b43efef48502b6a523045b7dbf4c8d2358 Mon Sep 17 00:00:00 2001 From: chrpetre <108675940+chrpetre@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:53:59 +0200 Subject: [PATCH 3/6] Update ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b40480d1..d94ffe35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,8 +98,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] - #os: [windows-latest, ubuntu-20.04] CP disabling windows testing while tests-pytest@v8 is not fixed + os: [windows-latest, ubuntu-20.04] python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - name: Install Ubuntu dependencies for RomViewerSharedLib.so From 0863018e9f8513ae74dff81e5dbf47ec06d450e3 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:35:35 +0200 Subject: [PATCH 4/6] fix: remove tests reqs file --- pyproject.toml | 7 +++++++ requirements/requirements_tests.txt | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 requirements/requirements_tests.txt diff --git a/pyproject.toml b/pyproject.toml index aff85cd9..985a18d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,13 @@ pyvista = ">=0.38.6" tqdm = ">=4.45.0" pywin32 = {version = ">=304", markers = "platform_system == 'Windows'"} +[tool.poetry.group.tests] +optional = true + +[tool.poetry.group.tests.dependencies] +pytest = ">=7.1.0" +pytest-cov = ">=3.0.0" + [tool.black] line-length = 120 diff --git a/requirements/requirements_tests.txt b/requirements/requirements_tests.txt deleted file mode 100644 index a7a65165..00000000 --- a/requirements/requirements_tests.txt +++ /dev/null @@ -1,2 +0,0 @@ -pytest>=7.1.0 -pytest-cov>=3.0.0 From e34cd2f8d6921df04fd34f1778427f3611adf8ec Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:41:34 +0200 Subject: [PATCH 5/6] Revert "fix: remove tests reqs file" This reverts commit 0863018e9f8513ae74dff81e5dbf47ec06d450e3. --- pyproject.toml | 7 ------- requirements/requirements_tests.txt | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) create mode 100644 requirements/requirements_tests.txt diff --git a/pyproject.toml b/pyproject.toml index 985a18d3..aff85cd9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,13 +31,6 @@ pyvista = ">=0.38.6" tqdm = ">=4.45.0" pywin32 = {version = ">=304", markers = "platform_system == 'Windows'"} -[tool.poetry.group.tests] -optional = true - -[tool.poetry.group.tests.dependencies] -pytest = ">=7.1.0" -pytest-cov = ">=3.0.0" - [tool.black] line-length = 120 diff --git a/requirements/requirements_tests.txt b/requirements/requirements_tests.txt new file mode 100644 index 00000000..a7a65165 --- /dev/null +++ b/requirements/requirements_tests.txt @@ -0,0 +1,2 @@ +pytest>=7.1.0 +pytest-cov>=3.0.0 From c47033faea9ec7fe6ee690edeb4603cbd3fada15 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:52:29 +0200 Subject: [PATCH 6/6] tmp: use dedicated branch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d94ffe35..669f54ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: uses: pyvista/setup-headless-display-action@v2 - name: Run pytest - uses: ansys/actions/tests-pytest@v8 + uses: ansys/actions/tests-pytest@fix/poetry-tests-pytest with: python-version: ${{ matrix.python-version }} pytest-extra-args: "--cov=pytwin --cov-report=term --cov-report=xml:.cov/coverage.xml --cov-report=html:.cov/html"