Skip to content

Commit

Permalink
Merge pull request #711 from isuruf/3.9.20
Browse files Browse the repository at this point in the history
3.9.20
  • Loading branch information
isuruf authored Sep 22, 2024
2 parents 6755f88 + 38fad54 commit a8c5deb
Show file tree
Hide file tree
Showing 20 changed files with 138 additions and 96 deletions.
6 changes: 5 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

14 changes: 10 additions & 4 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,21 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libffi:
Expand Down Expand Up @@ -43,5 +47,7 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
14 changes: 10 additions & 4 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -17,9 +21,9 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
- quay.io/condaforge/linux-anvil-cos7-x86_64
libffi:
- '3.4'
libuuid:
Expand Down Expand Up @@ -47,5 +51,7 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
14 changes: 10 additions & 4 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ bzip2:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -13,9 +17,9 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
libffi:
- '3.4'
libuuid:
Expand All @@ -41,5 +45,7 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
12 changes: 8 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '11.0'
bzip2:
- '1'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
libffi:
- '3.4'
macos_machine:
Expand Down Expand Up @@ -44,4 +48,4 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
12 changes: 9 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
bzip2:
- '1'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
libffi:
- '3.4'
macos_machine:
Expand Down Expand Up @@ -42,4 +48,4 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
8 changes: 5 additions & 3 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
bzip2:
- '1'
c_compiler:
- vs2017
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2017
- vs2019
libffi:
- '3.4'
openssl:
Expand All @@ -27,4 +29,4 @@ tk:
xz:
- '5'
zlib:
- '1.2'
- '1'
4 changes: 2 additions & 2 deletions .gitattributes

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

16 changes: 14 additions & 2 deletions .scripts/build_steps.sh

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

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh

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

9 changes: 7 additions & 2 deletions .scripts/run_win_build.bat

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

25 changes: 0 additions & 25 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit a8c5deb

Please sign in to comment.