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 88% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_build_variantpyqt.yaml index 4fec014..cbeb270 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_build_variantpyqt.yaml @@ -1,3 +1,5 @@ +build_variant: +- pyqt cdt_name: - cos6 channel_sources: 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 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 3792cad..310c416 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,14 @@ {% set version = "1.7.1" %} {% set sha256 = "a87bbc998b792532d2c87add8b0f7bbf28a4d8cf5db1bdfb6d6e260791754498" %} {% set pymin = "3.9" %} -{% set build = 0 %} +{% 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 }} @@ -15,6 +22,7 @@ source: build: number: {{ build }} + string: {{ build_string }} outputs: - name: mne-base @@ -83,7 +91,8 @@ outputs: - pyvistaqt >=0.4 - statsmodels - numexpr - - pyqt + - pyqt # [build_variant == "pyqt"] + - pyside6 # [build_variant == "pyside6"] - pillow - joblib - psutil