Skip to content

Commit

Permalink
Merge pull request #9 from AnacondaRecipes/sb_v3.19.1
Browse files Browse the repository at this point in the history
Update to v3.19.1
  • Loading branch information
ScottBailey authored Jan 6, 2022
2 parents 0407369 + d7d3dd4 commit 7b1139b
Show file tree
Hide file tree
Showing 36 changed files with 168 additions and 64 deletions.
13 changes: 9 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.

12 changes: 10 additions & 2 deletions .azure-pipelines/azure-pipelines-osx.yml

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

10 changes: 5 additions & 5 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
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -19,7 +19,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -19,7 +19,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos7
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
32 changes: 32 additions & 0 deletions .ci_support/migrations/python310.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
migrator_ts: 1634137107
__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 # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
paused: false
longterm: True
pr_limit: 20
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
- cross-python
- python_abi

python:
- 3.10.* *_cpython
# additional entries to add for zip_keys
numpy:
- 1.21
python_impl:
- cpython
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -19,7 +19,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
31 changes: 31 additions & 0 deletions .ci_support/osx_arm64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '11'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- python_impl
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge/label/rust_dev,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge/label/rust_dev,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -11,7 +11,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.10.* *_cpython
python_impl:
- cpython
target_platform:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down
Loading

0 comments on commit 7b1139b

Please sign in to comment.