Skip to content

Commit

Permalink
psutil v5.9.7 (#70)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@github-actions
github-actions[bot] authored Dec 17, 2023
2 parents 4fcb1a4 + 3e57a0c commit 81aadd5
Show file tree
Hide file tree
Showing 46 changed files with 108 additions and 171 deletions.
3 changes: 3 additions & 0 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.

3 changes: 3 additions & 0 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.

3 changes: 3 additions & 0 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.

3 changes: 0 additions & 3 deletions .ci_support/linux_64_python3.10.____cpython.yaml
View file
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

This file was deleted.

5 changes: 1 addition & 4 deletions .ci_support/osx_64_python3.10.____cpython.yaml
View file
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
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
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
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
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
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
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
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
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
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

0 comments on commit 81aadd5

Please sign in to comment.