Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osx arm fix #62

Merged
merged 11 commits into from
Mar 3, 2022
Merged
16 changes: 8 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.

22 changes: 14 additions & 8 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: 1 addition & 2 deletions .azure-pipelines/azure-pipelines-win.yml

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

7 changes: 6 additions & 1 deletion .ci_support/README

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,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
- '10'
numpy:
- '1.18'
pin_run_as_build:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
- - c_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:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
- '10'
numpy:
- '1.18'
pin_run_as_build:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
- - c_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:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
- '10'
numpy:
- '1.19'
pin_run_as_build:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_73_pypy
python_impl:
- pypy
target_platform:
- linux-64
zip_keys:
- - c_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:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
- '10'
numpy:
- '1.19'
pin_run_as_build:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_73_pypy
python_impl:
- pypy
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -22,10 +22,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
34 changes: 34 additions & 0 deletions .ci_support/osx_arm64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
- gfortran
fortran_compiler_version:
- '11'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.19'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
34 changes: 34 additions & 0 deletions .ci_support/osx_arm64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
fortran_compiler:
- gfortran
fortran_compiler_version:
- '11'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.19'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/win_64_numpy1.18python3.7.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
zip_keys:
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/win_64_numpy1.18python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
zip_keys:
- - python
- numpy
- python_impl
Loading