Merge pull request #287 from h-vetinari/meson

Rebuild with unpatched & GA build-deps
conda-forge · Oct 21, 2024 · 3cf51e1 · 3cf51e1
2 parents 8e723e9 + 3d9ccc8
commit 3cf51e1
Show file tree

Hide file tree

Showing 34 changed files with 143 additions and 159 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpython.yaml
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpython.yaml
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpython.yaml
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_64_numpy2.1python3.13.____cp313.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.13.* *_cp313
-python_impl:
-- cpython
 target_platform:
 - linux-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml
@@ -42,8 +42,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-aarch64
 zip_keys:
@@ -54,5 +52,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml
@@ -42,8 +42,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-aarch64
 zip_keys:
@@ -54,5 +52,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml
@@ -42,8 +42,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-aarch64
 zip_keys:
@@ -54,5 +52,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_aarch64_numpy2.1python3.13.____cp313.yaml
@@ -15,7 +15,7 @@ cdt_arch:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
@@ -42,8 +42,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.13.* *_cp313
-python_impl:
-- cpython
 target_platform:
 - linux-aarch64
 zip_keys:
@@ -54,5 +52,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-ppc64le
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-ppc64le
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - linux-ppc64le
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_numpy2.1python3.13.____cp313.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
@@ -38,8 +38,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.13.* *_cp313
-python_impl:
-- cpython
 target_platform:
 - linux-ppc64le
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - cdt_name
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/migrations/flang19.yaml b/.ci_support/migrations/flang19.yaml
@@ -0,0 +1,13 @@
+__migrator:
+  kind: version
+  migration_number: 1
+  build_number: 1
+  commit_message: Rebuild for flang 19
+  platform_allowlist:
+    - win-64
+  override_cbc_keys:
+    - fortran_compiler_stub
+migrator_ts: 1722763680.3089325
+
+fortran_compiler_version:      # [win64]
+  - 19                         # [win64]
diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml
@@ -18,11 +18,6 @@ __migrator:
             - 3.7.* *_73_pypy
             - 3.8.* *_73_pypy
             - 3.9.* *_73_pypy
-        channel_sources:
-            # doesn't seem to work properly when using additional_zip_keys
-            - conda-forge
-            - conda-forge/label/python_rc,conda-forge
-            - conda-forge/label/python_rc,conda-forge/label/llvm_rc,conda-forge
     paused: false
     longterm: true
     pr_limit: 20
@@ -42,8 +37,6 @@ __migrator:
 
 python:
 - 3.13.* *_cp313
-channel_sources:
-- conda-forge/label/python_rc,conda-forge
 # additional entries to add for zip_keys
 numpy:
 - 2.1

diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - osx-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - osx-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - osx-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml b/.ci_support/osx_64_numpy2.1python3.13.____cp313.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.13'
 channel_sources:
-- conda-forge/label/python_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.13.* *_cp313
-python_impl:
-- cpython
 target_platform:
 - osx-64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.10.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - osx-arm64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.11.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - osx-arm64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources
diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
@@ -40,8 +40,6 @@ pin_run_as_build:
     max_pin: x.x
 python:
 - 3.12.* *_cpython
-python_impl:
-- cpython
 target_platform:
 - osx-arm64
 zip_keys:
@@ -50,5 +48,4 @@ zip_keys:
   - fortran_compiler_version
 - - python
   - numpy
-  - python_impl
   - channel_sources