From bd0c84f3d21fb7b03dae3099c7fd0f8f32f25bac Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 30 Jun 2023 12:44:54 +0100 Subject: [PATCH 1/6] Run doc build on tag --- .github/workflows/docs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index bde0bc1e..13ce3b85 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,12 +1,15 @@ name: Build docs on: + pull_request: branches: - main push: branches: - main + tags: + - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10 jobs: build-docs: From d2fa291c0549536562130eef467a875cf41dacf8 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 30 Jun 2023 12:45:12 +0100 Subject: [PATCH 2/6] Upload docs temp --- .github/workflows/docs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 13ce3b85..74b6e55b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -46,7 +46,6 @@ jobs: name: Upload docs to GitHub pages runs-on: ubuntu-latest needs: build-docs - if: contains(github.ref, 'tags') steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 From 87d34f586ae59e596507914479ce8b431b890d50 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 30 Jun 2023 12:45:26 +0100 Subject: [PATCH 3/6] Put back doc deploy guard --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 74b6e55b..13ce3b85 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -46,6 +46,7 @@ jobs: name: Upload docs to GitHub pages runs-on: ubuntu-latest needs: build-docs + if: contains(github.ref, 'tags') steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 From 19404398c55fa0f20646dbba8ecec44c5146186e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 20:07:32 +0000 Subject: [PATCH 4/6] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/setup-cfg-fmt: v2.3.0 → v2.4.0](https://github.com/asottile/setup-cfg-fmt/compare/v2.3.0...v2.4.0) - [github.com/charliermarsh/ruff-pre-commit: v0.0.275 → v0.0.276](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.275...v0.0.276) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 767aedf6..71aa4ae5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/asottile/setup-cfg-fmt - rev: v2.3.0 + rev: v2.4.0 hooks: - id: setup-cfg-fmt @@ -29,7 +29,7 @@ repos: - repo: https://github.com/charliermarsh/ruff-pre-commit # Ruff version. - rev: 'v0.0.275' + rev: 'v0.0.276' hooks: - id: ruff From 4d8cf5eb9dbac715b9b5b7f573dbcb1a8bb73587 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 21 Jul 2023 09:15:51 +0100 Subject: [PATCH 5/6] Pin max verison of napari --- docs/changelog.rst | 7 +++++++ setup.cfg | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 64771d30..574cd02e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,13 @@ Changelog ========= +1.0.1 +----- +Bug fixes +~~~~~~~~~ +- Pinned that maximum version of `napari` to 0.4.17, since `napari-matplotlib` + does not yet work with `napari 0.4.18`. + 1.0.0 ----- diff --git a/setup.cfg b/setup.cfg index b03f446c..dfd52347 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ project_urls = packages = find: install_requires = matplotlib - napari + napari<0.4.18 numpy tinycss2 python_requires = >=3.8 From d0a3e830fcd02bda0851e4228ddf5dbf289709f2 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 21 Jul 2023 09:26:48 +0100 Subject: [PATCH 6/6] Fix changelog --- docs/changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 574cd02e..a31a0d3a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,8 +5,8 @@ Changelog ----- Bug fixes ~~~~~~~~~ -- Pinned that maximum version of `napari` to 0.4.17, since `napari-matplotlib` - does not yet work with `napari 0.4.18`. +- Pinned that maximum version of `napari` to 0.4.17, since ``napari-matplotlib`` + does not yet work with ``napari`` 0.4.18. 1.0.0 -----