From fa3c17d790f9d6df562426e1a54aa952dd15859b Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:52:00 -0500 Subject: [PATCH 1/6] add missing dependencies, update CHANGES.rst --- .github/workflows/publish-mastodon.yml | 5 ++--- CHANGES.rst | 8 ++++++++ environment.yml | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-mastodon.yml b/.github/workflows/publish-mastodon.yml index 632d686a6..3552ef8c2 100644 --- a/.github/workflows/publish-mastodon.yml +++ b/.github/workflows/publish-mastodon.yml @@ -77,9 +77,8 @@ jobs: if: ${{ github.event.inputs.dry-run != 'true' }} || ${{ github.event_name == 'release' }} uses: cbrgm/mastodon-github-action@eb0fa2c755679b459015a898dada174b5ddbff7c # v2.0.2 with: + url: ${{ secrets.MASTODON_URL }} + access_token: ${{ secrets.MASTODON_ACCESS_TOKEN }} language: "en" message: "${{ steps.render_template.outputs.result }}${{ env.contributors }}" visibility: "public" - env: - MASTODON_URL: ${{ secrets.MASTODON_URL }} - MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }} diff --git a/CHANGES.rst b/CHANGES.rst index f9fbddc7a..18ab2efaa 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,14 @@ Changelog ========= +v0.48.1 (2024-02-19) +-------------------- +Contributors to this version: Trevor James Smith (:user:`Zeitsperre`) + +Bug fixes +^^^^^^^^^ +* Fixed an issue with missing `conda` dependencies in the `xclim` documentation. + v0.48.0 (2024-02-19) -------------------- Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`), Pascal Bourgault (:user:`aulemahal`), Trevor James Smith (:user:`Zeitsperre`), David Huard (:user:`huard`), Éric Dupuis (:user:`coxipi`), Dante Castro (:user:`profesorpaiche`), Gabriel Rondeau-Genesse (:user:`RondeauG`). diff --git a/environment.yml b/environment.yml index b920d038f..1dd8a9405 100644 --- a/environment.yml +++ b/environment.yml @@ -27,6 +27,7 @@ dependencies: - yamale # Extras - flox + - lmoments3 # Required for some Jupyter notebooks # Testing and development dependencies - black ==24.1.1 - blackdoc ==0.3.9 From ca9a0e907f1e4a151f2f80a75ed60b3248a2fda6 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:54:33 -0500 Subject: [PATCH 2/6] update CHANGES.rst --- CHANGES.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 18ab2efaa..4232f6ed6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,11 +4,12 @@ Changelog v0.48.1 (2024-02-19) -------------------- -Contributors to this version: Trevor James Smith (:user:`Zeitsperre`) +Contributors to this version: Trevor James Smith (:user:`Zeitsperre`). Bug fixes ^^^^^^^^^ -* Fixed an issue with missing `conda` dependencies in the `xclim` documentation. +* Fixed an issue with missing `conda` dependencies in the `xclim` documentation. (:pull:`1657`). +* Adjusted the Mastodon publishing workflow. (:pull:`1657`). v0.48.0 (2024-02-19) -------------------- From 8ef93f00cc76d2dd43758cc442b009c4dbd25d39 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:55:00 -0500 Subject: [PATCH 3/6] =?UTF-8?q?Bump=20version:=200.48.0=20=E2=86=92=200.48?= =?UTF-8?q?.1-dev.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- xclim/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7f5568180..bca17532c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -123,7 +123,7 @@ target-version = [ ] [tool.bumpversion] -current_version = "0.48.0" +current_version = "0.48.1-dev.0" commit = true commit_args = "--no-verify" tag = false diff --git a/xclim/__init__.py b/xclim/__init__.py index e8e2f3c91..4342a71da 100644 --- a/xclim/__init__.py +++ b/xclim/__init__.py @@ -16,7 +16,7 @@ __author__ = """Travis Logan""" __email__ = "logan.travis@ouranos.ca" -__version__ = "0.48.0" +__version__ = "0.48.1-dev.0" _module_data = _files("xclim.data") From 60719287bdcce6569b233a59b64696cc80b96a8f Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:55:05 -0500 Subject: [PATCH 4/6] =?UTF-8?q?Bump=20version:=200.48.1-dev.0=20=E2=86=92?= =?UTF-8?q?=200.48.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- xclim/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bca17532c..dc4b43525 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -123,7 +123,7 @@ target-version = [ ] [tool.bumpversion] -current_version = "0.48.1-dev.0" +current_version = "0.48.1" commit = true commit_args = "--no-verify" tag = false diff --git a/xclim/__init__.py b/xclim/__init__.py index 4342a71da..2e60fc118 100644 --- a/xclim/__init__.py +++ b/xclim/__init__.py @@ -16,7 +16,7 @@ __author__ = """Travis Logan""" __email__ = "logan.travis@ouranos.ca" -__version__ = "0.48.1-dev.0" +__version__ = "0.48.1" _module_data = _files("xclim.data") From 12af384d7a2bbbfb497b3e12fa1a44058f1bdb56 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:57:36 -0500 Subject: [PATCH 5/6] adjust config --- .github/workflows/publish-mastodon.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-mastodon.yml b/.github/workflows/publish-mastodon.yml index 3552ef8c2..170e63ea6 100644 --- a/.github/workflows/publish-mastodon.yml +++ b/.github/workflows/publish-mastodon.yml @@ -78,7 +78,7 @@ jobs: uses: cbrgm/mastodon-github-action@eb0fa2c755679b459015a898dada174b5ddbff7c # v2.0.2 with: url: ${{ secrets.MASTODON_URL }} - access_token: ${{ secrets.MASTODON_ACCESS_TOKEN }} - language: "en" + access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }} message: "${{ steps.render_template.outputs.result }}${{ env.contributors }}" + language: "en" visibility: "public" From 54761723e5709c304ef700b89dc80b4039d0e3a9 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 19 Feb 2024 16:10:45 -0500 Subject: [PATCH 6/6] adjust harden-runner actions --- .github/workflows/publish-mastodon.yml | 6 +++++- .github/workflows/publish-pypi.yml | 8 +++++++- .github/workflows/tag-testpypi.yml | 8 +++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-mastodon.yml b/.github/workflows/publish-mastodon.yml index 170e63ea6..34cef6cdb 100644 --- a/.github/workflows/publish-mastodon.yml +++ b/.github/workflows/publish-mastodon.yml @@ -27,7 +27,11 @@ jobs: - name: Harden Runner uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 with: - egress-policy: audit + disable-sudo: true + egress-policy: block + allowed-endpoints: > + api.github.com:443 + github.com:443 - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 95d0e82ae..15a593d8c 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -20,7 +20,13 @@ jobs: - name: Harden Runner uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 with: - egress-policy: audit + disable-sudo: true + egress-policy: block + allowed-endpoints: > + files.pythonhosted.org:443 + github.com:443 + pypi.org:443 + upload.pypi.org:443 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Python3 uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 diff --git a/.github/workflows/tag-testpypi.yml b/.github/workflows/tag-testpypi.yml index 3f49bda86..9fadaa84f 100644 --- a/.github/workflows/tag-testpypi.yml +++ b/.github/workflows/tag-testpypi.yml @@ -20,7 +20,13 @@ jobs: - name: Harden Runner uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 with: - egress-policy: audit + disable-sudo: true + egress-policy: block + allowed-endpoints: > + files.pythonhosted.org:443 + github.com:443 + pypi.org:443 + test.pypi.org:443 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Python3 uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0