Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v5.9.6 #75

Merged
merged 7 commits into from
Feb 8, 2024
Merged

v5.9.6 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b233cde
v5.9.6
thewchan Jan 30, 2024
1d5b9a9
Add missing includes for v5.9.7
nehaljwani Dec 17, 2023
67a5876
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
Feb 2, 2024
0dd3f54
Added upstream patch for pypy
thewchan Feb 7, 2024
9006050
Add selector to pypy patch
thewchan Feb 7, 2024
9a31cf6
Always apply PyPy patch
jakirkham Feb 7, 2024
7e0ed5d
Remove unneeded patch portion
thewchan Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.10.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.11.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/linux_64_python3.12.____cpython.yaml
View file
Open in desktop
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/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand All @@ -18,6 +18,3 @@ python:
- 3.12.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.8.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.9.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.9.* *_73_pypy
target_platform:
- linux-64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.9.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ python:
- 3.10.* *_cpython
target_platform:
- linux-aarch64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ python:
- 3.11.* *_cpython
target_platform:
- linux-aarch64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/linux_aarch64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand All @@ -22,6 +22,3 @@ python:
- 3.12.* *_cpython
target_platform:
- linux-aarch64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ python:
- 3.8.* *_cpython
target_platform:
- linux-aarch64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.9.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ python:
- 3.9.* *_73_pypy
target_platform:
- linux-aarch64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_aarch64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ python:
- 3.9.* *_cpython
target_platform:
- linux-aarch64
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.10.* *_cpython
target_platform:
- linux-ppc64le
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.11.* *_cpython
target_platform:
- linux-ppc64le
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/linux_ppc64le_python3.12.____cpython.yaml
View file
Open in desktop
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/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand All @@ -18,6 +18,3 @@ python:
- 3.12.* *_cpython
target_platform:
- linux-ppc64le
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.8.* *_cpython
target_platform:
- linux-ppc64le
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.9.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.9.* *_73_pypy
target_platform:
- linux-ppc64le
zip_keys:
- - python
- channel_sources
3 changes: 0 additions & 3 deletions .ci_support/linux_ppc64le_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ python:
- 3.9.* *_cpython
target_platform:
- linux-ppc64le
zip_keys:
- - python
- channel_sources
37 changes: 0 additions & 37 deletions .ci_support/migrations/python311.yaml
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions .ci_support/osx_64_python3.10.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.10.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_64_python3.11.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.11.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- channel_sources
7 changes: 2 additions & 5 deletions .ci_support/osx_64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
Expand All @@ -18,6 +18,3 @@ python:
- 3.12.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_64_python3.8.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.8.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_64_python3.9.____73_pypy.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.9.* *_73_pypy
target_platform:
- osx-64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_64_python3.9.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.9.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_arm64_python3.10.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.10.* *_cpython
target_platform:
- osx-arm64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_arm64_python3.11.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.11.* *_cpython
target_platform:
- osx-arm64
zip_keys:
- - python
- channel_sources
7 changes: 2 additions & 5 deletions .ci_support/osx_arm64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
Expand All @@ -18,6 +18,3 @@ python:
- 3.12.* *_cpython
target_platform:
- osx-arm64
zip_keys:
- - python
- channel_sources
5 changes: 1 addition & 4 deletions .ci_support/osx_arm64_python3.8.____cpython.yaml
View file
Open in desktop
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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,6 +18,3 @@ python:
- 3.8.* *_cpython
target_platform:
- osx-arm64
zip_keys:
- - python
- channel_sources
Loading