Skip to content

Commit

Permalink
Merge pull request #35 from marius-mather/arm64_build
Browse files Browse the repository at this point in the history
Update build for v0.12.0, including arm64
  • Loading branch information
bdewilde authored Mar 9, 2023
2 parents 87ee083 + cd07876 commit 8019617
Show file tree
Hide file tree
Showing 20 changed files with 276 additions and 219 deletions.
4 changes: 0 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml

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

48 changes: 48 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.

73 changes: 21 additions & 52 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.

34 changes: 0 additions & 34 deletions .ci_support/migrations/python310.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.7.* *_cpython
- 3.10.* *_cpython
target_platform:
- win-64
- osx-arm64
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- x86_64-apple-darwin13.4.0
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.7.* *_cpython
- 3.8.* *_cpython
target_platform:
- osx-64
- osx-arm64
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
cdt_name:
- cos6
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.7.* *_cpython
- 3.9.* *_cpython
target_platform:
- linux-64
- osx-arm64
3 changes: 2 additions & 1 deletion .circleci/config.yml

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

1 change: 1 addition & 0 deletions .gitattributes

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

18 changes: 15 additions & 3 deletions .scripts/build_steps.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh

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

Loading

0 comments on commit 8019617

Please sign in to comment.