Skip to content

Commit

Permalink
Merge pull request #250 from adrianinsaval/update
Browse files Browse the repository at this point in the history 
5.15.15
  • Loading branch information
@hmaarrfk
hmaarrfk authored Oct 30, 2024
2 parents 5b93d1a + 88087b6 commit cdc6d8c
Show file tree
Hide file tree
Showing 40 changed files with 402 additions and 392 deletions.
9 changes: 5 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

11 changes: 6 additions & 5 deletions .azure-pipelines/azure-pipelines-osx.yml
View file

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

23 changes: 4 additions & 19 deletions .azure-pipelines/azure-pipelines-win.yml
View file

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

12 changes: 9 additions & 3 deletions .ci_support/linux_64_python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,11 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
12 changes: 9 additions & 3 deletions .ci_support/linux_64_python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,11 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
14 changes: 10 additions & 4 deletions ...pport/linux_64_python3.8.____cpython.yaml → ...port/linux_64_python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,19 +15,21 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
12 changes: 9 additions & 3 deletions .ci_support/linux_64_python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,11 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
12 changes: 9 additions & 3 deletions .ci_support/linux_aarch64_python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,11 +19,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -31,3 +35,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
12 changes: 9 additions & 3 deletions .ci_support/linux_aarch64_python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,11 +19,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -31,3 +35,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
14 changes: 10 additions & 4 deletions .../linux_aarch64_python3.8.____cpython.yaml → ...linux_aarch64_python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,19 +19,21 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
12 changes: 9 additions & 3 deletions .ci_support/linux_aarch64_python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,11 +19,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -31,3 +35,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2212.yaml
View file

This file was deleted.

Loading

2 comments on commit cdc6d8c

@adrianinsaval
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe CI needs to be rerun for the cross compiled builds now that their respective build platform packages are available

@hmaarrfk
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this is correct. i've allowed a self circular dependency. its a risk. but thanks for the reminder!

Please sign in to comment.