From 315621afb667e937db93445ce4360f538b63b242 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:39:31 +0000 Subject: [PATCH 1/7] Bump codecov/codecov-action from 3.1.1 to 4.5.0 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.1 to 4.5.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3.1.1...v4.5.0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de52b7262..c0dea5daf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: coverage run -m pytest -v -s --html=${{ matrix.os }}_${{ matrix.python-version }}_unit_test_report.html --self-contained-html tests coverage xml - name: Codecov - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v4.5.0 with: token: ${{ secrets.CODECOV_TOKEN }} flags: unit-tests @@ -73,7 +73,7 @@ jobs: coverage run -m pytest -v -s --nbval-lax -k "not documentation" --html="${{ matrix.os }}_integration_test_report.html" --self-contained-html docs/examples coverage xml - name: Codecov - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v4.5.0 with: token: ${{ secrets.CODECOV_TOKEN }} flags: integration-tests @@ -98,7 +98,7 @@ jobs: run: | mypy --install-types --non-interactive parcels --cobertura-xml-report mypy_report - name: Upload mypy coverage to Codecov - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v4.5.0 if: ${{ always() }} # Upload even on error of mypy with: token: ${{ secrets.CODECOV_TOKEN }} From 4797c6195159a07e75c692df3109ab72ac854392 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:39:35 +0000 Subject: [PATCH 2/7] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pypi-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index f88b180a6..d85ffeeeb 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -55,7 +55,7 @@ jobs: name: Install Python with: python-version: 3.10 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: releases path: dist @@ -84,7 +84,7 @@ jobs: if: github.event_name == 'release' runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: releases path: dist From 46cad1c80498965f9bfd008dd8dfaced4eb73f39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:39:39 +0000 Subject: [PATCH 3/7] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pypi-release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de52b7262..18fb5a37e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: python-version: "3.11" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Conda and parcels uses: ./.github/actions/install-parcels with: @@ -63,7 +63,7 @@ jobs: python-version: ["3.12"] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Conda and parcels uses: ./.github/actions/install-parcels with: @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Conda and parcels uses: ./.github/actions/install-parcels with: diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index f88b180a6..d110589de 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'OceanParcels/parcels' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-python@v3 From 852f72c93738e12d900c1d7f57bb672526ccd234 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:05:26 +0200 Subject: [PATCH 4/7] Upload artifact and download artifact migration As per https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md --- .github/workflows/ci.yml | 19 +++++++++++++++---- .github/workflows/pypi-release.yml | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de52b7262..44adf2b0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,9 +49,9 @@ jobs: flags: unit-tests - name: Upload test results if: ${{ always() }} # Always run this step, even if tests fail - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v4 with: - name: Unittest report + name: Unittest report ${{ matrix.os }}-${{ matrix.python-version }} path: ${{ matrix.os }}_${{ matrix.python-version }}_unit_test_report.html integration-test: name: "py${{ matrix.python-version }} | ${{ matrix.os }} | integration tests" @@ -79,10 +79,21 @@ jobs: flags: integration-tests - name: Upload test results if: ${{ always() }} # Always run this step, even if tests fail - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v4 with: - name: Integration test report + name: Integration test report ${{ matrix.os }} path: ${{ matrix.os }}_integration_test_report.html + merge-test-artifacts: + runs-on: ubuntu-latest + needs: + - unit-test + - integration-test + steps: + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: Testing reports + pattern: "* report *" typechecking: name: mypy runs-on: ubuntu-latest diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index d85ffeeeb..30da10086 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -42,7 +42,7 @@ jobs: else echo "✅ Looks good" fi - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: releases path: dist From e87f6e58be736caa1fe7efae528fdc3b43f85fe8 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:09:09 +0200 Subject: [PATCH 5/7] Update codecov action As per codecov/codecov-action/1274 --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0dea5daf..e008088f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,8 +44,9 @@ jobs: coverage xml - name: Codecov uses: codecov/codecov-action@v4.5.0 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - token: ${{ secrets.CODECOV_TOKEN }} flags: unit-tests - name: Upload test results if: ${{ always() }} # Always run this step, even if tests fail @@ -74,8 +75,9 @@ jobs: coverage xml - name: Codecov uses: codecov/codecov-action@v4.5.0 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - token: ${{ secrets.CODECOV_TOKEN }} flags: integration-tests - name: Upload test results if: ${{ always() }} # Always run this step, even if tests fail @@ -100,8 +102,9 @@ jobs: - name: Upload mypy coverage to Codecov uses: codecov/codecov-action@v4.5.0 if: ${{ always() }} # Upload even on error of mypy + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - token: ${{ secrets.CODECOV_TOKEN }} file: mypy_report/cobertura.xml flags: mypy fail_ci_if_error: false From 01fca19afecabd6edfa711030e9d325337c2cd2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:16:47 +0000 Subject: [PATCH 6/7] Bump pypa/gh-action-pypi-publish from 1.5.0 to 1.9.0 Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.5.0 to 1.9.0. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.5.0...v1.9.0) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pypi-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index 30da10086..915a73de8 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -72,7 +72,7 @@ jobs: - name: Publish package to TestPyPI if: github.event_name == 'push' - uses: pypa/gh-action-pypi-publish@v1.5.0 + uses: pypa/gh-action-pypi-publish@v1.9.0 with: user: __token__ password: ${{ secrets.PARCELS_PYPI_TEST_TOKEN }} @@ -89,7 +89,7 @@ jobs: name: releases path: dist - name: Publish package to PyPI - uses: pypa/gh-action-pypi-publish@v1.5.0 + uses: pypa/gh-action-pypi-publish@v1.9.0 with: user: __token__ password: ${{ secrets.PARCELS_PYPI_PROD_TOKEN }} From 22c0e5fdf2993861f278659b1c614a33032b6852 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:18:46 +0000 Subject: [PATCH 7/7] Bump actions/setup-python from 3 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v3...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pypi-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index 953f5ff14..9acd0a5b1 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 name: Install Python with: python-version: 3.10 @@ -51,7 +51,7 @@ jobs: needs: build-artifacts runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 name: Install Python with: python-version: 3.10