Remove code from all dist_utils.py that was breaking the environment market python_version in requirements.txt

skiedude · skiedude · commit f525c96e0497 · 2025-01-30T14:00:11.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
