Skip to content

Commit

Permalink
Merge pull request #99 from regro-cf-autotick-bot/6.0.1.post202410241…
Browse files Browse the repository at this point in the history
…521_h707840

cgal v6.0.1.post202410241521
  • Loading branch information
lrineau authored Oct 25, 2024
2 parents 06c5710 + 404d14a commit e67dd25
Show file tree
Hide file tree
Showing 38 changed files with 106 additions and 135 deletions.
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.

19 changes: 2 additions & 17 deletions .azure-pipelines/azure-pipelines-win.yml

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

1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
3 changes: 1 addition & 2 deletions .ci_support/linux_64_numpy2python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
3 changes: 1 addition & 2 deletions .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -45,4 +45,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
3 changes: 1 addition & 2 deletions .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cdt_name
- - python
- numpy
- channel_sources
42 changes: 0 additions & 42 deletions .ci_support/migrations/python312.yaml

This file was deleted.

1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
3 changes: 1 addition & 2 deletions .ci_support/osx_64_numpy2python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib:
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
3 changes: 1 addition & 2 deletions .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand Down Expand Up @@ -41,4 +41,3 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy2.0python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ target_platform:
zip_keys:
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy2.0python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ target_platform:
zip_keys:
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ target_platform:
zip_keys:
- - python
- numpy
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy2.0python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ target_platform:
zip_keys:
- - python
- numpy
- channel_sources
3 changes: 1 addition & 2 deletions .ci_support/win_64_numpy2python3.13.____cp313.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c_compiler:
c_stdlib:
- vs
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -27,4 +27,3 @@ target_platform:
zip_keys:
- - python
- numpy
- channel_sources
14 changes: 7 additions & 7 deletions .scripts/build_steps.sh

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

43 changes: 27 additions & 16 deletions .scripts/run_osx_build.sh

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

Loading

0 comments on commit e67dd25

Please sign in to comment.