Skip to content

Commit 7a5e7a6

Browse files
committed
Bump psutil to 5.9.0
`rg 'psutil==' -l | xargs sd 'psutil==5.7.2' 'psutil==5.9.0'` [test] Revert "Support Windows E2E testing in CI for Python 2 (#9596)" This reverts commit 3a5d2a3. This is to test if the Python 3 end to end test fails.
1 parent e773f59 commit 7a5e7a6

14 files changed

Lines changed: 19 additions & 13 deletions

File tree

.azure-pipelines/templates/test-single-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
${{ if ne(parameters.agent_image_win_py2, '') }}:
4343
DDEV_E2E_AGENT_PY2: ${{ parameters.agent_image_win_py2 }}
4444

45+
DDEV_E2E_AGENT: datadog/agent-dev:master-py3-win-servercore
4546
# Generic tag check disabled on non-core repo
4647
${{ if not(eq(parameters.run_py2_tests, 'true')) }}:
4748
TOX_SKIP_ENV: py27.* # Don't run py2 tests

btrfs/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
psutil==5.7.2
1+
psutil==5.9.0

datadog_checks_base/datadog_checks/base/data/agent_requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ paramiko==2.7.2
4848
ply==3.11
4949
prometheus-client==0.9.0
5050
protobuf==3.7.0
51-
psutil==5.7.2
51+
psutil==5.9.0
5252
psycopg2-binary==2.8.6
5353
pyasn1==0.4.6
5454
pycryptodomex==3.10.1

disk/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
psutil==5.7.2
1+
psutil==5.9.0

disk/tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ envdir =
1010
py27: {toxworkdir}/py27
1111
py38: {toxworkdir}/py38
1212
description =
13-
py{27,38}: e2e ready
13+
py27: e2e ready if platform_system != 'Windows'
14+
py38: e2e ready
1415
dd_check_style = true
1516
usedevelop = true
1617
platform = linux|darwin|win32

dns_check/tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ envdir =
1010
py27: {toxworkdir}/py27
1111
py38: {toxworkdir}/py38
1212
description=
13-
py{27,38}: e2e ready
13+
py27: e2e ready if platform_system != 'Windows'
14+
py38: e2e ready
1415
dd_check_style = true
1516
dd_check_types = true
1617
dd_mypy_args =

gunicorn/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
psutil==5.7.2
1+
psutil==5.9.0

network/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
psutil==5.7.2
1+
psutil==5.9.0

pdh_check/tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ envdir =
1111
py38: {toxworkdir}/py38
1212
dd_check_style = true
1313
description =
14-
py{27,38}: e2e ready
14+
py27: e2e ready if platform_system != 'Windows'
15+
py38: e2e ready
1516
usedevelop = true
1617
platform = win32
1718
deps =

process/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
psutil==5.7.2
1+
psutil==5.9.0

0 commit comments

Comments
 (0)