Skip to content

Commit

Permalink
Merge pull request #255 from h-vetinari/win_meson_clean
Browse files Browse the repository at this point in the history
meson on windows with clang-cl & flang; python 3.12 support
  • Loading branch information
h-vetinari authored Oct 5, 2023
2 parents b0e17a5 + 79de424 commit ccf7ef7
Show file tree
Hide file tree
Showing 21 changed files with 357 additions and 170 deletions.
20 changes: 12 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml

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

6 changes: 6 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.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
@@ -0,0 +1,45 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ libcblas:
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
- 3.12.* *_cpython
python_impl:
- pypy
- cpython
target_platform:
- linux-aarch64
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ libcblas:
liblapack:
- 3.9 *netlib
numpy:
- '1.22'
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
- 3.12.* *_cpython
python_impl:
- pypy
- cpython
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
42 changes: 42 additions & 0 deletions .ci_support/migrations/python312.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
migrator_ts: 1695046563
__migrator:
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 60
max_solver_attempts: 5 # this will make the bot retry "not solvable" stuff 5 times
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi
exclude_pinned_pkgs: false
additional_zip_keys:
- channel_sources

python:
- 3.12.* *_cpython
channel_sources:
- conda-forge/label/python_rc,conda-forge
# additional entries to add for zip_keys
numpy:
- 1.26
python_impl:
- cpython
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
45 changes: 45 additions & 0 deletions .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -12,8 +12,6 @@ libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
m2w64_fortran_compiler:
- m2w64-toolchain
numpy:
- '1.23'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge/label/llvm_rc,conda-forge/label/meson_dev,conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
numpy:
- '1.26'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.12.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
zip_keys:
- - python
- numpy
- python_impl
Loading

0 comments on commit ccf7ef7

Please sign in to comment.