MAINT: Require vtk=*=qt_* by default (#86)

* MAINT: Require vtk=*=qt_* by default * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.10.08.41.05 * FIX: Numbering * FIX: Skip * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.10.08.41.05 * FIX: Which * FIX: Variant
conda-forge · Jul 10, 2024 · 5bc8392 · 5bc8392
1 parent d5ed40a
commit 5bc8392
Show file tree

Hide file tree

Showing 25 changed files with 171 additions and 52 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_64_build_variantnoqtnumpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_build_variantnoqtnumpy2.0python3.10.____cpython.yaml
@@ -0,0 +1,39 @@
+build_variant:
+- noqt
+c_compiler:
+- gcc
+c_compiler_version:
+- '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+numpy:
+- '2.0'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.10.* *_cpython
+qt6_main:
+- '6.7'
+qt_main:
+- '5.15'
+target_platform:
+- linux-64
+vtk:
+- 9.3.0
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
+- - python
+  - numpy
diff --git a/.ci_support/linux_64_build_variantnoqtnumpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_build_variantnoqtnumpy2.0python3.11.____cpython.yaml
@@ -0,0 +1,39 @@
+build_variant:
+- noqt
+c_compiler:
+- gcc
+c_compiler_version:
+- '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+numpy:
+- '2.0'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.11.* *_cpython
+qt6_main:
+- '6.7'
+qt_main:
+- '5.15'
+target_platform:
+- linux-64
+vtk:
+- 9.3.0
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
+- - python
+  - numpy
diff --git a/.ci_support/linux_64_build_variantnoqtnumpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_build_variantnoqtnumpy2.0python3.12.____cpython.yaml
@@ -0,0 +1,39 @@
+build_variant:
+- noqt
+c_compiler:
+- gcc
+c_compiler_version:
+- '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
+cdt_name:
+- cos7
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+numpy:
+- '2.0'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.12.* *_cpython
+qt6_main:
+- '6.7'
+qt_main:
+- '5.15'
+target_platform:
+- linux-64
+vtk:
+- 9.3.0
+zip_keys:
+- - c_stdlib_version
+  - cdt_name
+- - python
+  - numpy
diff --git a/.ci_support/osx_64_build_variantpyqtnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_build_variantpyqtnumpy2.0python3.10.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_64_build_variantpyqtnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_build_variantpyqtnumpy2.0python3.11.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_64_build_variantpyqtnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_build_variantpyqtnumpy2.0python3.12.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_64_build_variantpyside6numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_build_variantpyside6numpy2.0python3.10.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_64_build_variantpyside6numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_build_variantpyside6numpy2.0python3.11.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_64_build_variantpyside6numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_build_variantpyside6numpy2.0python3.12.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_build_variantpyqtnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_build_variantpyqtnumpy2.0python3.10.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-arm64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_build_variantpyqtnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_build_variantpyqtnumpy2.0python3.11.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-arm64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_build_variantpyqtnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_build_variantpyqtnumpy2.0python3.12.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-arm64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_build_variantpyside6numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_build_variantpyside6numpy2.0python3.10.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-arm64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_build_variantpyside6numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_build_variantpyside6numpy2.0python3.11.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-arm64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/osx_arm64_build_variantpyside6numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_build_variantpyside6numpy2.0python3.12.____cpython.yaml
@@ -32,8 +32,6 @@ qt_main:
 - '5.15'
 target_platform:
 - osx-arm64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/win_64_build_variantpyqtnumpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_build_variantpyqtnumpy2.0python3.10.____cpython.yaml
@@ -22,8 +22,6 @@ qt_main:
 - '5.15'
 target_platform:
 - win-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/win_64_build_variantpyqtnumpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_build_variantpyqtnumpy2.0python3.11.____cpython.yaml
@@ -22,8 +22,6 @@ qt_main:
 - '5.15'
 target_platform:
 - win-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/win_64_build_variantpyqtnumpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_build_variantpyqtnumpy2.0python3.12.____cpython.yaml
@@ -22,8 +22,6 @@ qt_main:
 - '5.15'
 target_platform:
 - win-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/win_64_build_variantpyside6numpy2.0python3.10.____cpython.yaml b/.ci_support/win_64_build_variantpyside6numpy2.0python3.10.____cpython.yaml
@@ -22,8 +22,6 @@ qt_main:
 - '5.15'
 target_platform:
 - win-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/win_64_build_variantpyside6numpy2.0python3.11.____cpython.yaml b/.ci_support/win_64_build_variantpyside6numpy2.0python3.11.____cpython.yaml
@@ -22,8 +22,6 @@ qt_main:
 - '5.15'
 target_platform:
 - win-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/.ci_support/win_64_build_variantpyside6numpy2.0python3.12.____cpython.yaml b/.ci_support/win_64_build_variantpyside6numpy2.0python3.12.____cpython.yaml
@@ -22,8 +22,6 @@ qt_main:
 - '5.15'
 target_platform:
 - win-64
-vtk:
-- 9.3.0
 zip_keys:
 - - python
   - numpy
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,3 +1,4 @@
 build_variant:
   - "pyqt"
   - "pyside6"
+  - "noqt"  # [linux64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,11 +1,12 @@
 {% set version = "4.8.2" %}
-{% set build = 4 %}
+{% set build = 5 %}
 
 # 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 = build + 100 %}  # [build_variant == "noqt"]
+{% set build = build + 200 %}  # [build_variant == "pyside6"]
+{% set build = build + 300 %}  # [build_variant == "pyqt"]
 
 package:
   name: mayavi
@@ -33,32 +34,35 @@ requirements:
   build:
     - {{ compiler('c') }}
     - {{ stdlib("c") }}
-    - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-    - python                                 # [build_platform != target_platform]
-    - numpy                                  # [build_platform != target_platform]
-    - cython                                 # [build_platform != target_platform]
-    - vtk                                    # [build_platform != target_platform]
-    - qt-main                                # [build_platform != target_platform and build_variant == "pyqt"]
-    - qt6-main                                # [build_platform != target_platform and build_variant == "pyside6"]
+    - cross-python_{{ target_platform }}  # [build_platform != target_platform]
+    - python                              # [build_platform != target_platform]
+    - numpy                               # [build_platform != target_platform]
+    - cython                              # [build_platform != target_platform]
+    - vtk =*=osmesa_*                     # [build_platform != target_platform and build_variant == "noqt"]
+    - vtk =*=qt_*                         # [build_platform != target_platform and build_variant != "noqt"]
+    - qt-main                             # [build_platform != target_platform and build_variant == "pyqt"]
+    - qt6-main                            # [build_platform != target_platform and build_variant == "pyside6"]
   host:
     - python
     - pip
     - cython
     - numpy
-    - vtk
-    - qt-main  # [build_variant == "pyqt"]
-    - qt6-main  # [build_variant == "pyside6"]
+    - vtk =*=osmesa_*  # [build_variant == "noqt"]
+    - vtk =*=qt_*      # [build_variant != "noqt"]
+    - qt-main          # [build_variant == "pyqt"]
+    - qt6-main         # [build_variant == "pyside6"]
     - traitsui
     - apptools
   run:
     - python
-    - vtk
+    - vtk =*=qt_*  # [build_variant != "noqt"]
+    - vtk          # [build_variant == "noqt"]
     - traitsui
     - pyface
     - apptools
     - envisage
-    - pyqt  # [build_variant == "pyqt"]
-    - pyside6  # [build_variant == "pyside6"]
+    - pyqt         # [build_variant == "pyqt"]
+    - pyside6      # [build_variant == "pyside6"]
     - setuptools
 
 test:
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,8 +32,6 @@ qt_main: @@
     - '5.15'
     target_platform:
     - osx-64
-    vtk:
-    - 9.3.0
     zip_keys:
     - - python
       - numpy