Skip to content

Commit

Permalink
Fix multiple tags, loosen napari-plugin-manager pin (#167)
Browse files Browse the repository at this point in the history
* Unpin setuptools

* Keep only latest tag for given commit

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Obtain current ref from git log directly

* Revert debugging

* More generous pin for napari-plugin-manager

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
jaimergp and pre-commit-ci[bot] authored Jul 15, 2024
1 parent 77c2e08 commit 14ce0f5
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
30 changes: 29 additions & 1 deletion .github/workflows/make_bundle_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,20 @@ jobs:
with:
environment-file: napari-packaging/environments/ci_packages_environment.yml

- name: Prevent issues with multiple tags
shell: bash -el {0}
if: github.event.inputs.ref || github.ref_type == 'tag'
working-directory: napari-source
run: |
set -x
ref=$(git log -1 --format='%H')
last_tag=$(git tag --list --points-at "$ref" --sort creatordate | tail -1)
for tag in $(git tag --list --points-at "$ref" --sort creatordate); do
if [[ $tag != $last_tag ]]; then
git tag --delete $tag
fi
done
- name: install napari
shell: bash -el {0}
working-directory: napari-source
Expand Down Expand Up @@ -268,7 +282,21 @@ jobs:
conda config --show-sources
mkdir -p ${CONDA_BLD_PATH}/noarch
- name: set up build dependencies
- name: Prevent issues with multiple tags
shell: bash -el {0}
if: github.event.inputs.ref || github.ref_type == 'tag'
working-directory: napari-source
run: |
set -x
ref=$(git log -1 --format='%H')
last_tag=$(git tag --list --points-at "$ref" --sort creatordate | tail -1)
for tag in $(git tag --list --points-at "$ref" --sort creatordate); do
if [[ $tag != $last_tag ]]; then
git tag --delete $tag
fi
done
- name: Install napari
shell: bash -el {0}
working-directory: napari-source
run: |
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ outputs:
- zarr >=2.12.0

run_constrained:
- napari-plugin-manager >=0.1.0a2,<0.2.0a0
- napari-plugin-manager >=0.1.0a2,<0.3.0a0
- pyside2 >=5.13.2,!=5.15.0
- pyside6 <6.5,>=6.7
- pyqt >=5.12.3,!=5.15.0,<6.0a0|>=6.5,!=6.6.1
Expand Down
2 changes: 1 addition & 1 deletion environments/ci_packages_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ dependencies:
- tomlkit
- ruamel.yaml
- anaconda-client
- setuptools <66.0a
- setuptools

0 comments on commit 14ce0f5

Please sign in to comment.