From a4916b46563a05aa0665034efa06e543454d77c2 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Tue, 5 Mar 2024 12:12:26 +0100 Subject: [PATCH] Update dask version constraint and watch `pyproject.toml` (#116) * Update dask version constraint * Rename workflow * adjust for pyproject.toml * couple more renames --- .github/PYPROJECT_TOML_UPDATED_TEMPLATE.md | 15 +++++++++++++++ .github/SETUP_CFG_UPDATED_TEMPLATE.md | 15 --------------- ...check_setup_cfg.yml => upstream_checks.yml} | 18 +++++++++--------- conda-recipe/README.md | 4 ++-- conda-recipe/meta.yaml | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 .github/PYPROJECT_TOML_UPDATED_TEMPLATE.md delete mode 100644 .github/SETUP_CFG_UPDATED_TEMPLATE.md rename .github/workflows/{check_setup_cfg.yml => upstream_checks.yml} (73%) diff --git a/.github/PYPROJECT_TOML_UPDATED_TEMPLATE.md b/.github/PYPROJECT_TOML_UPDATED_TEMPLATE.md new file mode 100644 index 00000000..f9eb2915 --- /dev/null +++ b/.github/PYPROJECT_TOML_UPDATED_TEMPLATE.md @@ -0,0 +1,15 @@ +--- +title: "`pyproject.toml` was updated ({{ env.PYPROJECT_TOML_TODAY }})" +assignees: jaimergp +--- + +The file `pyproject.toml` was modified in `napari/napari`. This might mean the conda-recipe in +`napari/packaging` needs adjusting! Please check! + +Calculated diff: + +```diff +{{ env.PYPROJECT_TOML_CHANGES }} +``` + +cc @jaimergp diff --git a/.github/SETUP_CFG_UPDATED_TEMPLATE.md b/.github/SETUP_CFG_UPDATED_TEMPLATE.md deleted file mode 100644 index d7faeff7..00000000 --- a/.github/SETUP_CFG_UPDATED_TEMPLATE.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: "`setup.cfg` was updated ({{ env.SETUP_CFG_TODAY }})" -assignees: jaimergp ---- - -The file `setup.cfg` was modified in `napari/napari`. This might mean the conda-recipe in -`napari/packaging` needs adjusting! Please check! - -Calculated diff: - -```diff -{{ env.SETUP_CFG_CHANGES }} -``` - -cc @jaimergp diff --git a/.github/workflows/check_setup_cfg.yml b/.github/workflows/upstream_checks.yml similarity index 73% rename from .github/workflows/check_setup_cfg.yml rename to .github/workflows/upstream_checks.yml index f2082800..12747a6a 100644 --- a/.github/workflows/check_setup_cfg.yml +++ b/.github/workflows/upstream_checks.yml @@ -17,11 +17,11 @@ concurrency: cancel-in-progress: true jobs: - check_setup_cfg: + check_pyproject_toml_changes: permissions: contents: read issues: write - name: Report setup.cfg changes + name: Report pyproject.toml changes runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -29,28 +29,28 @@ jobs: repository: napari/napari fetch-depth: 0 - - name: Did setup.cfg change since yesterday + - name: Did pyproject.toml change since yesterday run: | - changes="$(git diff $(git log -1 --before=@{last.day} --format=%H) setup.cfg)" + changes="$(git diff $(git log -1 --before=@{last.day} --format=%H) pyproject.toml)" echo "$changes" if [[ -n "$changes" ]]; then - echo 'SETUP_CFG_CHANGES<> $GITHUB_ENV + echo 'PYPROJECT_TOML_CHANGES<> $GITHUB_ENV echo "$changes" >> $GITHUB_ENV echo 'EOF${{ github.run_id }}' >> $GITHUB_ENV - echo "SETUP_CFG_TODAY=$(date -I)" >> $GITHUB_ENV + echo "PYPROJECT_TOML_TODAY=$(date -I)" >> $GITHUB_ENV fi - name: Checkout packaging code - if: env.SETUP_CFG_CHANGES && github.event_name == 'schedule' + if: env.PYPROJECT_TOML_CHANGES && github.event_name == 'schedule' uses: actions/checkout@v4 with: repository: napari/packaging - name: Create issue - if: env.SETUP_CFG_CHANGES && github.event_name == 'schedule' + if: env.PYPROJECT_TOML_CHANGES && github.event_name == 'schedule' uses: JasonEtco/create-an-issue@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - filename: .github/SETUP_CFG_UPDATED_TEMPLATE.md + filename: .github/PYPROJECT_TOML_UPDATED_TEMPLATE.md update_existing: true diff --git a/conda-recipe/README.md b/conda-recipe/README.md index cea883bd..454151d9 100644 --- a/conda-recipe/README.md +++ b/conda-recipe/README.md @@ -3,11 +3,11 @@ This folder is a patched copy of the conda-forge/napari-feedstock `recipe/` dire - The `outputs` section might be different too to accommodate changes happening during development (e.g. new dependency was added.) -Use this link to see what happened in `napari/napari:setup.cfg`, compared to last release: +Use this link to see what happened in `napari/napari:pyproject.toml`, compared to last release: https://github.com/napari/napari/compare/v${VERSION_HERE}...main -and look for `setup.cfg` in the Files tab. +and look for `pyproject.toml` in the Files tab. The point of having a local copy is to be able to update it while developing the next release, without needing to publish the changes on conda-forge. On releases, the recipe contents here diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index fcae265c..17eae2ff 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -34,7 +34,7 @@ outputs: run: - python >=3.8 - # dependencies matched to setup.cfg + # dependencies matched to pyproject.toml - app-model >=0.2.2,<0.3.0a - appdirs >=1.4.4 - cachey >=0.2.1 @@ -43,7 +43,7 @@ outputs: # in the distributed dependency # conda-forge doesn't have the dask-array subpackage # so depend on cytoolz and numpy manually - - dask-core>=2.15.0,!=2.28.0 + - dask-core >=2021.10.0 - cytoolz >=0.11.0 - imageio >=2.20,!=2.22.1 - jsonschema >=3.2.0