Skip to content

Commit

Permalink
Merge pull request #48 from eqcorrscan/main
Browse files Browse the repository at this point in the history
EQcorrscan 0.5.0
  • Loading branch information
calum-chamberlain authored Dec 12, 2023
2 parents 2a0e400 + a2bdb72 commit 8e6b27b
Show file tree
Hide file tree
Showing 26 changed files with 396 additions and 161 deletions.
24 changes: 13 additions & 11 deletions .azure-pipelines/azure-pipelines-linux.yml

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

33 changes: 21 additions & 12 deletions .azure-pipelines/azure-pipelines-osx.yml

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

67 changes: 18 additions & 49 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
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fftw:
- '3'
numpy:
- '1.21'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fftw:
- '3'
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ docker_image:
fftw:
- '3'
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
27 changes: 27 additions & 0 deletions .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fftw:
- '3'
numpy:
- '1.23'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- numpy
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:
- '14'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ fftw:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.21'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
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:
- '14'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ fftw:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
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:
- '14'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ fftw:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
27 changes: 27 additions & 0 deletions .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
fftw:
- '3'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.23'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
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:
- '14'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ fftw:
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.21'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
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:
- '14'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ fftw:
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
- '1.20'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
Expand Down
Loading

0 comments on commit 8e6b27b

Please sign in to comment.