From 505720d6bc7a0e9fbfd840598551357f1ad1e3c3 Mon Sep 17 00:00:00 2001 From: Jordan Sanders Date: Tue, 21 May 2024 10:08:44 -0500 Subject: [PATCH 1/4] Switch our requests pin to only exclude 2.32.0 Both docker-py and requests have fixes in flight. We can narrow our pin to only exclude the breaking version. https://github.com/docker/docker-py/pull/3257 https://github.com/psf/requests/issues/6707#issuecomment-2122490651 --- .../backcompat-test-suite/webserver_service/pins.txt | 4 ++-- python_modules/dagster/setup.py | 2 +- python_modules/libraries/dagster-celery-docker/setup.py | 2 +- python_modules/libraries/dagster-docker/setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt b/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt index 37a1279c09a63..1a985d3970b8a 100644 --- a/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt +++ b/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt @@ -17,5 +17,5 @@ sqlalchemy<2.0.0 # Added pendulum pin in later versions pendulum<3 -# 2.32.0 breaks our docker tests https://buildkite.com/dagster/dagster-dagster/builds/83562 -requests<2.32.0 +# https://github.com/dagster-io/dagster/pull/21977 +requests!=2.32.0 diff --git a/python_modules/dagster/setup.py b/python_modules/dagster/setup.py index f52c2f44293a3..8d74810ce7a54 100644 --- a/python_modules/dagster/setup.py +++ b/python_modules/dagster/setup.py @@ -138,7 +138,7 @@ def get_version() -> str: "morefs[asynclocal]", "fsspec<2024.5.0", # morefs incompatibly "rapidfuzz", - "requests<2.32.0", # 2.32.0 breaks our docker tests https://buildkite.com/dagster/dagster-dagster/builds/83562 + "requests!=2.32.0", # https://github.com/dagster-io/dagster/pull/21977 ], "mypy": ["mypy==1.8.0"], "pyright": [ diff --git a/python_modules/libraries/dagster-celery-docker/setup.py b/python_modules/libraries/dagster-celery-docker/setup.py index f10291fccd5ad..7c7cf7e84718c 100644 --- a/python_modules/libraries/dagster-celery-docker/setup.py +++ b/python_modules/libraries/dagster-celery-docker/setup.py @@ -36,7 +36,7 @@ def get_version() -> str: f"dagster-celery{pin}", f"dagster-graphql{pin}", "docker", - "requests<2.32.0", # 2.32.0 breaks our docker tests https://buildkite.com/dagster/dagster-dagster/builds/83562 + "requests!=2.32.0", # https://github.com/dagster-io/dagster/pull/21977 ], zip_safe=False, ) diff --git a/python_modules/libraries/dagster-docker/setup.py b/python_modules/libraries/dagster-docker/setup.py index b283f780239ba..62d915a5cb9d5 100644 --- a/python_modules/libraries/dagster-docker/setup.py +++ b/python_modules/libraries/dagster-docker/setup.py @@ -38,7 +38,7 @@ def get_version() -> str: f"dagster{pin}", "docker", "docker-image-py", - "requests<2.32.0", # 2.32.0 breaks our docker tests https://buildkite.com/dagster/dagster-dagster/builds/83562 + "requests!=2.32.0", # https://github.com/dagster-io/dagster/pull/21977 ], zip_safe=False, ) From 52a4fc786b7a864c29300f52baf03450e39262f3 Mon Sep 17 00:00:00 2001 From: Jordan Sanders Date: Tue, 21 May 2024 10:09:25 -0500 Subject: [PATCH 2/4] [NO_SKIP=True] Trigger full build From b01d1b907ecdcd19c56004fda18ff559e37d80e3 Mon Sep 17 00:00:00 2001 From: Jordan Sanders Date: Tue, 21 May 2024 10:20:42 -0500 Subject: [PATCH 3/4] Also pin around 2.32.1 requests had a second patch release yesterday where the issue still persists. --- .../backcompat-test-suite/webserver_service/pins.txt | 2 +- python_modules/dagster/setup.py | 2 +- python_modules/libraries/dagster-celery-docker/setup.py | 2 +- python_modules/libraries/dagster-docker/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt b/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt index 1a985d3970b8a..4d361e3d24b22 100644 --- a/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt +++ b/integration_tests/test_suites/backcompat-test-suite/webserver_service/pins.txt @@ -18,4 +18,4 @@ sqlalchemy<2.0.0 pendulum<3 # https://github.com/dagster-io/dagster/pull/21977 -requests!=2.32.0 +requests!=2.32.0,!=2.32.1 diff --git a/python_modules/dagster/setup.py b/python_modules/dagster/setup.py index 8d74810ce7a54..11ef3d547cc00 100644 --- a/python_modules/dagster/setup.py +++ b/python_modules/dagster/setup.py @@ -138,7 +138,7 @@ def get_version() -> str: "morefs[asynclocal]", "fsspec<2024.5.0", # morefs incompatibly "rapidfuzz", - "requests!=2.32.0", # https://github.com/dagster-io/dagster/pull/21977 + "requests!=2.32.0,2.32.1", # https://github.com/dagster-io/dagster/pull/21977 ], "mypy": ["mypy==1.8.0"], "pyright": [ diff --git a/python_modules/libraries/dagster-celery-docker/setup.py b/python_modules/libraries/dagster-celery-docker/setup.py index 7c7cf7e84718c..36ee8c6866dc0 100644 --- a/python_modules/libraries/dagster-celery-docker/setup.py +++ b/python_modules/libraries/dagster-celery-docker/setup.py @@ -36,7 +36,7 @@ def get_version() -> str: f"dagster-celery{pin}", f"dagster-graphql{pin}", "docker", - "requests!=2.32.0", # https://github.com/dagster-io/dagster/pull/21977 + "requests!=2.32.0,!2.32.1", # https://github.com/dagster-io/dagster/pull/21977 ], zip_safe=False, ) diff --git a/python_modules/libraries/dagster-docker/setup.py b/python_modules/libraries/dagster-docker/setup.py index 62d915a5cb9d5..31e01c981851a 100644 --- a/python_modules/libraries/dagster-docker/setup.py +++ b/python_modules/libraries/dagster-docker/setup.py @@ -38,7 +38,7 @@ def get_version() -> str: f"dagster{pin}", "docker", "docker-image-py", - "requests!=2.32.0", # https://github.com/dagster-io/dagster/pull/21977 + "requests!=2.32.0,!=2.32.1", # https://github.com/dagster-io/dagster/pull/21977 ], zip_safe=False, ) From b1357d8ce231cdf70508b76e3070216c026d1022 Mon Sep 17 00:00:00 2001 From: Jordan Sanders Date: Tue, 21 May 2024 10:21:03 -0500 Subject: [PATCH 4/4] [NO_SKIP=true] Trigger full build