From 21634e1465473d973f04dd37e0026b37d4b0b422 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Thu, 29 Aug 2024 16:34:49 +0200 Subject: [PATCH] Update requirements in `meta.yaml`, use recent `constructor` and `conda` (#179) * Update constraints for app-model and pyqt * Update lower bound for napari-plugin-manager * parametrize docker image from .ci_support yaml * fix test * add numpy * require latest constructor and conda --- .github/workflows/make_bundle_conda.yml | 6 ++++-- conda-recipe/meta.yaml | 10 ++++------ environments/ci_installers_environment.yml | 7 ++++--- environments/ci_packages_environment.yml | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/make_bundle_conda.yml b/.github/workflows/make_bundle_conda.yml index 3b78a806..80e3f831 100644 --- a/.github/workflows/make_bundle_conda.yml +++ b/.github/workflows/make_bundle_conda.yml @@ -50,6 +50,7 @@ jobs: if: startsWith(github.repository, 'napari') env: conda_bld_suffix: /napari-feedstock/build_artifacts/ + conda_build_config: linux_64_ # filename without extension under feedstock's .ci_support/ outputs: artifact-id: ${{ steps.artifact-id.outputs.name }} @@ -129,13 +130,14 @@ jobs: conda-smithy rerender git diff mv ${GITHUB_WORKSPACE}/napari-source . + echo "DOCKER_IMAGE=$(shyaml -y get-value docker_image.0 < .ci_support/${conda_build_config}.yaml)" >> $GITHUB_ENV - name: Run build scripts shell: bash -el {0} working-directory: napari-feedstock env: - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - CONFIG: linux_64_ # filename under feedstock's .ci_support/ + DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }} + CONFIG: ${{ env.conda_build_config }} CI: github_actions CONDA_BLD_PATH: "${{ github.workspace }}${{ env.conda_bld_suffix }}" run: | diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index d1f354fa..6c86447c 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -32,7 +32,7 @@ outputs: - python >=3.9 # dependencies matched to pyproject.toml - - app-model >=0.2.5,<0.3.0a + - app-model >=0.2.8,<0.3.0a - appdirs >=1.4.4 - cachey >=0.2.1 - certifi >=2018.1.18 @@ -74,7 +74,7 @@ outputs: run_constrained: - 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 + - pyqt >=5.13.2,!=5.15.0,<6.0a0|>=6.5,!=6.6.1 test: requires: @@ -95,9 +95,7 @@ outputs: - export QT_API=pyqt5 # [unix] - which napari - napari --info # [not linux] - - 'QT_DEBUG_PLUGINS=1 LIBGL_DEBUG=verbose QT_QPA_PLATFORM=offscreen xvfb-run --auto-servernum napari --info > napari_info.txt 2>&1 || true' # [linux] - - cat napari_info.txt # [linux] - - 'grep -C99 "napari: ${PKG_VERSION}" napari_info.txt' # [linux] + - 'QT_DEBUG_PLUGINS=1 LIBGL_DEBUG=verbose xvfb-run --auto-servernum napari --info | grep -C99 "napari: ${PKG_VERSION}"' # [linux] # - pytest --pyargs napari about: @@ -119,7 +117,7 @@ outputs: run: - {{ pin_subpackage('napari-base', exact=True) }} - fsspec - - napari-plugin-manager >=0.1.0a2,<0.3.0a0 + - napari-plugin-manager >=0.1.0,<0.3.0a0 - napari-svg >=0.1.8 - numba >=0.57.1 - pooch >=1.3.0 diff --git a/environments/ci_installers_environment.yml b/environments/ci_installers_environment.yml index fe24a23f..64b1ff41 100644 --- a/environments/ci_installers_environment.yml +++ b/environments/ci_installers_environment.yml @@ -4,11 +4,12 @@ channels: dependencies: - python - pip - - constructor >=3.6.0,!=3.8.0 + - constructor >=3.9.3 - conda-build >=3.28 - ruamel.yaml - - conda-standalone >=23.11.0 - - conda >=23.11.0 + - conda-standalone >=24.7.1 + - conda >=24.7.1 - conda-libmamba-solver # only needed to import napari and get the path to the logo.png file - lazy_loader >=0.2 + - numpy >=1.22.2 diff --git a/environments/ci_packages_environment.yml b/environments/ci_packages_environment.yml index 6784c24c..b9ad35a3 100644 --- a/environments/ci_packages_environment.yml +++ b/environments/ci_packages_environment.yml @@ -9,3 +9,4 @@ dependencies: - ruamel.yaml - anaconda-client - setuptools + - shyaml