From 1515f6a4c230ad0ee13ff184f728e25fde569207 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Sat, 6 Jul 2024 15:27:25 -0400 Subject: [PATCH 1/6] BUG: Dont explicitly require qt --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3792cad..b931ccf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set version = "1.7.1" %} {% set sha256 = "a87bbc998b792532d2c87add8b0f7bbf28a4d8cf5db1bdfb6d6e260791754498" %} {% set pymin = "3.9" %} -{% set build = 0 %} +{% set build = 1 %} package: name: {{ name|lower }} @@ -83,7 +83,6 @@ outputs: - pyvistaqt >=0.4 - statsmodels - numexpr - - pyqt - pillow - joblib - psutil From 0478c3bfeef311c977e2f11998e0c9b5a391184b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:31:32 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.04.12.04.07 --- .ci_support/linux_64_.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4fec014..b44dfa6 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,5 +1,5 @@ cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: From 747e4346bb0dbbaef2a1bbfa57f0419b60187552 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Sat, 6 Jul 2024 16:53:48 -0400 Subject: [PATCH 3/6] ENH: Add noqt variant --- recipe/meta.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b931ccf..da9623b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,6 +56,22 @@ outputs: - pip - name: mne + build: + noarch: python + requirements: + run: + - {{ pin_subpackage('mne-noqt', max_pin="x.x.x.x") }} + - pyqt + test: + imports: + - mne + commands: + - pip check # [not win] + - mne --version + requires: + - pip + + - name: mne-noqt build: noarch: python From f693dd9319cf218d8b264febacf66d51c1dec27b Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 8 Jul 2024 16:14:14 -0400 Subject: [PATCH 4/6] ENH: Switch to build variants --- recipe/conda_build_config.yaml | 3 +++ recipe/meta.yaml | 25 +++++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..4f1798a --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,3 @@ +build_variant: + - "pyqt" + - "pyside6" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index da9623b..ecff6a1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,6 +4,13 @@ {% set pymin = "3.9" %} {% set build = 1 %} +# Adapted from https://github.com/conda-forge/vtk-feedstock/blob/main/recipe/meta.yaml +# PySide6 is lower priority than PyQt5 for backward compat (e.g., with matplotlib, +# mayavi, etc.) until the ecosystem updates +{% set build = build + 100 %} # [build_variant == "pyside6"] +{% set build = build + 200 %} # [build_variant == "pyqt"] +{% set build_string = '{}_py{}h{}_{}'.format(build_variant, CONDA_PY, PKG_HASH, build) %} + package: name: {{ name|lower }} version: {{ version }} @@ -56,22 +63,6 @@ outputs: - pip - name: mne - build: - noarch: python - requirements: - run: - - {{ pin_subpackage('mne-noqt', max_pin="x.x.x.x") }} - - pyqt - test: - imports: - - mne - commands: - - pip check # [not win] - - mne --version - requires: - - pip - - - name: mne-noqt build: noarch: python @@ -99,6 +90,8 @@ outputs: - pyvistaqt >=0.4 - statsmodels - numexpr + - pyqt # [build_variant == "pyqt"] + - pyside6 # [build_variant == "pyside6"] - pillow - joblib - psutil From c4ed0ece16adcf64a285061ad53d03f8e2f71984 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 8 Jul 2024 16:16:52 -0400 Subject: [PATCH 5/6] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.20.13.28.05 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++++-- .azure-pipelines/azure-pipelines-osx.yml | 7 +++++-- ...ux_64_.yaml => linux_64_build_variantpyqt.yaml} | 4 +++- .ci_support/linux_64_build_variantpyside6.yaml | 12 ++++++++++++ ...{osx_64_.yaml => osx_64_build_variantpyqt.yaml} | 2 ++ .ci_support/osx_64_build_variantpyside6.yaml | 14 ++++++++++++++ 6 files changed, 42 insertions(+), 5 deletions(-) rename .ci_support/{linux_64_.yaml => linux_64_build_variantpyqt.yaml} (84%) create mode 100644 .ci_support/linux_64_build_variantpyside6.yaml rename .ci_support/{osx_64_.yaml => osx_64_build_variantpyqt.yaml} (90%) create mode 100644 .ci_support/osx_64_build_variantpyside6.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..218a344 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_build_variantpyqt: + CONFIG: linux_64_build_variantpyqt + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantpyside6: + CONFIG: linux_64_build_variantpyside6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a8ca2b4..78cd06f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,8 +8,11 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_build_variantpyqt: + CONFIG: osx_64_build_variantpyqt + UPLOAD_PACKAGES: 'True' + osx_64_build_variantpyside6: + CONFIG: osx_64_build_variantpyside6 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_build_variantpyqt.yaml similarity index 84% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_build_variantpyqt.yaml index b44dfa6..cbeb270 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_build_variantpyqt.yaml @@ -1,5 +1,7 @@ +build_variant: +- pyqt cdt_name: -- cos7 +- cos6 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_build_variantpyside6.yaml b/.ci_support/linux_64_build_variantpyside6.yaml new file mode 100644 index 0000000..b160327 --- /dev/null +++ b/.ci_support/linux_64_build_variantpyside6.yaml @@ -0,0 +1,12 @@ +build_variant: +- pyside6 +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +target_platform: +- linux-64 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_build_variantpyqt.yaml similarity index 90% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_build_variantpyqt.yaml index 322c73b..65e6909 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_build_variantpyqt.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' MACOSX_SDK_VERSION: - '10.13' +build_variant: +- pyqt channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_build_variantpyside6.yaml b/.ci_support/osx_64_build_variantpyside6.yaml new file mode 100644 index 0000000..f6086b5 --- /dev/null +++ b/.ci_support/osx_64_build_variantpyside6.yaml @@ -0,0 +1,14 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' +build_variant: +- pyside6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +target_platform: +- osx-64 From a7c7e9df6357c92ab1717721a3d3b6f5e4899a49 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 8 Jul 2024 16:18:23 -0400 Subject: [PATCH 6/6] FIX: Str --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ecff6a1..310c416 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ source: build: number: {{ build }} + string: {{ build_string }} outputs: - name: mne-base