From f525c96e0497ea0c046c12c8b793d317309e2c04 Mon Sep 17 00:00:00 2001 From: Jacob Zufelt Date: Thu, 30 Jan 2025 14:00:11 -0700 Subject: [PATCH 1/3] Remove code from all dist_utils.py that was breaking the environment market python_version in requirements.txt --- CHANGELOG.rst | 1 + contrib/runners/action_chain_runner/dist_utils.py | 3 --- contrib/runners/announcement_runner/dist_utils.py | 3 --- contrib/runners/http_runner/dist_utils.py | 3 --- contrib/runners/inquirer_runner/dist_utils.py | 3 --- contrib/runners/local_runner/dist_utils.py | 3 --- contrib/runners/noop_runner/dist_utils.py | 3 --- contrib/runners/orquesta_runner/dist_utils.py | 3 --- contrib/runners/python_runner/dist_utils.py | 3 --- contrib/runners/remote_runner/dist_utils.py | 3 --- contrib/runners/winrm_runner/dist_utils.py | 3 --- scripts/dist_utils.py | 3 --- st2actions/dist_utils.py | 3 --- st2api/dist_utils.py | 3 --- st2auth/dist_utils.py | 3 --- st2client/dist_utils.py | 3 --- st2common/dist_utils.py | 3 --- st2reactor/dist_utils.py | 3 --- st2stream/dist_utils.py | 3 --- st2tests/dist_utils.py | 3 --- 20 files changed, 1 insertion(+), 57 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ea33b521ae..b23c33ac83 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -36,6 +36,7 @@ Fixed Changed ~~~~~~~ +* Removed code in all dist_utils.py that was sanitizing the `python_version` environment marker that limited packages in the requirements.txt only being installed on lower python versions. (by @skiedude) * Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118 * Bumped many deps based on the lockfiles generated by pants+pex. #6181 #6227 #6200 #6252 #6268 (by @cognifloyd and @nzlosh) * Switch to python3's standard lib unittest from unittest2, a backport of python3 unittest features for python2. #6187 (by @nzlosh) diff --git a/contrib/runners/action_chain_runner/dist_utils.py b/contrib/runners/action_chain_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/action_chain_runner/dist_utils.py +++ b/contrib/runners/action_chain_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/announcement_runner/dist_utils.py b/contrib/runners/announcement_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/announcement_runner/dist_utils.py +++ b/contrib/runners/announcement_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/http_runner/dist_utils.py b/contrib/runners/http_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/http_runner/dist_utils.py +++ b/contrib/runners/http_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/inquirer_runner/dist_utils.py b/contrib/runners/inquirer_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/inquirer_runner/dist_utils.py +++ b/contrib/runners/inquirer_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/local_runner/dist_utils.py b/contrib/runners/local_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/local_runner/dist_utils.py +++ b/contrib/runners/local_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/noop_runner/dist_utils.py b/contrib/runners/noop_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/noop_runner/dist_utils.py +++ b/contrib/runners/noop_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/orquesta_runner/dist_utils.py b/contrib/runners/orquesta_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/orquesta_runner/dist_utils.py +++ b/contrib/runners/orquesta_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/python_runner/dist_utils.py b/contrib/runners/python_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/python_runner/dist_utils.py +++ b/contrib/runners/python_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/remote_runner/dist_utils.py b/contrib/runners/remote_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/remote_runner/dist_utils.py +++ b/contrib/runners/remote_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/contrib/runners/winrm_runner/dist_utils.py b/contrib/runners/winrm_runner/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/contrib/runners/winrm_runner/dist_utils.py +++ b/contrib/runners/winrm_runner/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/scripts/dist_utils.py b/scripts/dist_utils.py index 9c27f683ca..d5014beb00 100644 --- a/scripts/dist_utils.py +++ b/scripts/dist_utils.py @@ -106,9 +106,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2actions/dist_utils.py b/st2actions/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2actions/dist_utils.py +++ b/st2actions/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2api/dist_utils.py b/st2api/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2api/dist_utils.py +++ b/st2api/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2auth/dist_utils.py b/st2auth/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2auth/dist_utils.py +++ b/st2auth/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2client/dist_utils.py b/st2client/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2client/dist_utils.py +++ b/st2client/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2common/dist_utils.py b/st2common/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2common/dist_utils.py +++ b/st2common/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2reactor/dist_utils.py b/st2reactor/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2reactor/dist_utils.py +++ b/st2reactor/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2stream/dist_utils.py b/st2stream/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2stream/dist_utils.py +++ b/st2stream/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) diff --git a/st2tests/dist_utils.py b/st2tests/dist_utils.py index fa752580a2..6e4d75de43 100644 --- a/st2tests/dist_utils.py +++ b/st2tests/dist_utils.py @@ -102,9 +102,6 @@ def _get_link(line): else: req_name = line - if ";" in req_name: - req_name = req_name.split(";")[0].strip() - reqs.append(req_name) return (reqs, links) From c88a2b3e3b5814b3bbfbaadbb05591f50971728d Mon Sep 17 00:00:00 2001 From: Jacob Zufelt Date: Tue, 4 Feb 2025 10:15:30 -0700 Subject: [PATCH 2/3] Test using the urllib pin from other PR --- st2common/in-requirements.txt | 2 ++ st2common/requirements.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index 260ac322d6..fecae64141 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -24,6 +24,8 @@ zstandard cffi cryptography requests +# urllib3 is a transitive dep +urllib3 retrying semver six diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 578bc80f0a..02cc464419 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -44,6 +44,7 @@ six==1.17.0 st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master tenacity==9.0.0 tooz==6.3.0 +urllib3==2.2.3 webob==1.8.9 zake==0.2.2 zstandard==0.23.0 From a2b74e81cfa63504a19f1da0f03cf86c6f27fe0a Mon Sep 17 00:00:00 2001 From: Jacob Zufelt Date: Tue, 4 Feb 2025 10:33:57 -0700 Subject: [PATCH 3/3] Remove urllib pin from other PR --- st2common/in-requirements.txt | 2 -- st2common/requirements.txt | 1 - 2 files changed, 3 deletions(-) diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index fecae64141..260ac322d6 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -24,8 +24,6 @@ zstandard cffi cryptography requests -# urllib3 is a transitive dep -urllib3 retrying semver six diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 02cc464419..578bc80f0a 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -44,7 +44,6 @@ six==1.17.0 st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master tenacity==9.0.0 tooz==6.3.0 -urllib3==2.2.3 webob==1.8.9 zake==0.2.2 zstandard==0.23.0