Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
build_variant:
- pyqt
cdt_name:
- cos6
channel_sources:
Expand Down
12 changes: 12 additions & 0 deletions .ci_support/linux_64_build_variantpyside6.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
build_variant:
- pyqt
channel_sources:
- conda-forge
channel_targets:
Expand Down
14 changes: 14 additions & 0 deletions .ci_support/osx_64_build_variantpyside6.yaml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build_variant:
- "pyqt"
- "pyside6"
13 changes: 11 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -15,6 +22,7 @@ source:

build:
number: {{ build }}
string: {{ build_string }}

outputs:
- name: mne-base
Expand Down Expand Up @@ -83,7 +91,8 @@ outputs:
- pyvistaqt >=0.4
- statsmodels
- numexpr
- pyqt
- pyqt # [build_variant == "pyqt"]
- pyside6 # [build_variant == "pyside6"]
- pillow
- joblib
- psutil
Expand Down