diff --git a/.ci_support/linux_64_qt_bindingspyqt.yaml b/.ci_support/linux_64_qt_bindingspyqt.yaml index 682d941..ba05f71 100644 --- a/.ci_support/linux_64_qt_bindingspyqt.yaml +++ b/.ci_support/linux_64_qt_bindingspyqt.yaml @@ -7,6 +7,6 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 qt: -- '5.12' +- '5.15' qt_bindings: - pyqt diff --git a/.ci_support/linux_64_qt_bindingspyside2.yaml b/.ci_support/linux_64_qt_bindingspyside2.yaml index c50ba40..5a4937c 100644 --- a/.ci_support/linux_64_qt_bindingspyside2.yaml +++ b/.ci_support/linux_64_qt_bindingspyside2.yaml @@ -7,6 +7,6 @@ channel_targets: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 qt: -- '5.12' +- '5.15' qt_bindings: - pyside2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f2428c2..e1d2cab 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh index cba0fae..17ec086 100755 --- a/.scripts/create_conda_build_artifacts.sh +++ b/.scripts/create_conda_build_artifacts.sh @@ -79,8 +79,8 @@ if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" elif [[ "$CI" == "github_actions" ]]; then - echo "::set-output name=BLD_ARTIFACT_NAME::$BLD_ARTIFACT_NAME" - echo "::set-output name=BLD_ARTIFACT_PATH::$BLD_ARTIFACT_PATH" + echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT fi fi @@ -107,7 +107,7 @@ if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" elif [[ "$CI" == "github_actions" ]]; then - echo "::set-output name=ENV_ARTIFACT_NAME::$ENV_ARTIFACT_NAME" - echo "::set-output name=ENV_ARTIFACT_PATH::$ENV_ARTIFACT_PATH" + echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT fi fi \ No newline at end of file diff --git a/README.md b/README.md index a99f47c..b6bee34 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,28 @@ +About napari-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/napari-feedstock/blob/main/LICENSE.txt) + About napari -============ +------------ Home: http://napari.org -Package license: BSD-3-Clause AND MIT +Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/napari-feedstock/blob/main/LICENSE.txt) +Summary: a fast n-dimensional image viewer in Python + +Development: https://github.com/napari/napari + +Documentation: http://napari.org + +a fast n-dimensional image viewer in Python +About napari +------------ + +Home: http://napari.org + +Package license: BSD-3-Clause AND MIT Summary: a fast n-dimensional image viewer in Python @@ -14,6 +31,20 @@ Development: https://github.com/napari/napari Documentation: http://napari.org a fast n-dimensional image viewer in Python +About napari-menu +----------------- + +Home: http://napari.org + +Package license: BSD-3-Clause + +Summary: provides menu icons for napari + +Development: https://github.com/napari/napari + +Documentation: http://napari.org + +provides menu icons for napari Current build status ==================== diff --git a/recipe/meta.yaml b/recipe/meta.yaml index af9105f..f63adfe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -60,7 +60,7 @@ outputs: - pint >=0.17 - psutil >=5.0 - psygnal>=0.3.4 - - pydantic >=1.9.0 + - pydantic >=1.9.0,<2 - pygments >=2.4.0 - pyopengl >=3.1.0 - pyyaml >=5.1