explicitly install requirementst for st2client testing

guzzijones · guzzijones · commit 33331c2795b0 · 2025-09-18T09:13:23.000-04:00
diff --git a/Makefile b/Makefile
@@ -536,8 +536,9 @@ flake8: requirements .flake8
 
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)"
+	$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install -r requirements.txt
 
-	$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install -e .; cd ..
+	$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd ..
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client"
 
diff --git a/contrib/runners/action_chain_runner/dist_utils.py b/contrib/runners/action_chain_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/announcement_runner/dist_utils.py b/contrib/runners/announcement_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/http_runner/dist_utils.py b/contrib/runners/http_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/inquirer_runner/dist_utils.py b/contrib/runners/inquirer_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/local_runner/dist_utils.py b/contrib/runners/local_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/noop_runner/dist_utils.py b/contrib/runners/noop_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/orquesta_runner/dist_utils.py b/contrib/runners/orquesta_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/python_runner/dist_utils.py b/contrib/runners/python_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/remote_runner/dist_utils.py b/contrib/runners/remote_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/contrib/runners/winrm_runner/dist_utils.py b/contrib/runners/winrm_runner/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/requirements.txt b/requirements.txt
@@ -39,7 +39,6 @@ orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2c
 oslo.config==9.6.0
 oslo.utils==7.3.0
 paramiko==3.5.1
-ply
 prettytable==3.10.2
 prompt-toolkit==3.0.52
 psutil==7.0.0
diff --git a/scripts/dist_utils.py b/scripts/dist_utils.py
@@ -40,12 +40,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2actions/dist_utils.py b/st2actions/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2api/dist_utils.py b/st2api/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2auth/dist_utils.py b/st2auth/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2client/dist_utils.py b/st2client/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2client/requirements.txt b/st2client/requirements.txt
@@ -14,7 +14,6 @@ importlib-metadata==7.1.0
 jsonpath-rw==1.4.0
 jsonschema==3.2.0
 orjson==3.10.15
-ply
 prettytable==3.10.2
 prompt-toolkit==3.0.52
 pyOpenSSL
diff --git a/st2common/dist_utils.py b/st2common/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2reactor/dist_utils.py b/st2reactor/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2stream/dist_utils.py b/st2stream/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
diff --git a/st2tests/dist_utils.py b/st2tests/dist_utils.py
@@ -36,12 +36,7 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
+text_type = str
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 
