Merge pull request #5949: pants: pin versions of pip and setuptools

Author: cognifloyd

CHANGELOG.rst

@@ -17,7 +17,7 @@ Added
   #5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850
   #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 #5864 #5874 #5884 #5893 #5891
   #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926 #5927 #5925 #5928 #5929 #5930
-  #5931 #5932 #5948
+  #5931 #5932 #5948 #5949
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805

lockfiles/st2.lock

@@ -192,6 +192,20 @@ config = "lint-configs/python/.flake8"
 [generate-lockfiles]
 diff = true
 
+[pex-cli]
+# [pex-cli] can be removed once we upgrade to pex 2.17
+# We overwrite `version` and `known_versions` to:
+#   - fix lockfile spaces to minimize the regen diff
+#   - make sure the locked pip/setuptools ends up in virtualenv exports
+#     https://github.com/pantsbuild/pex/issues/2105
+version = "v2.1.131"
+known_versions = [
+  "v2.1.131|macos_arm64|28b9dfc7e2f5f49f1e189b79eba3dd79ca2186f765009ea02dd6095f5359bf59|4084520",
+  "v2.1.131|macos_x86_64|28b9dfc7e2f5f49f1e189b79eba3dd79ca2186f765009ea02dd6095f5359bf59|4084520",
+  "v2.1.131|linux_x86_64|28b9dfc7e2f5f49f1e189b79eba3dd79ca2186f765009ea02dd6095f5359bf59|4084520",
+  "v2.1.131|linux_arm64|28b9dfc7e2f5f49f1e189b79eba3dd79ca2186f765009ea02dd6095f5359bf59|4084520"
+]
+
 [pylint]
 lockfile = "lockfiles/pylint.lock"
 version = "pylint~=2.8.2"

pants.toml

@@ -36,6 +36,8 @@ orquesta @ git+https://github.com/StackStorm/[email protected]
 # See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details
 oslo.config>=1.12.1,<1.13
 paramiko
+# we use pip at runtime
+pip
 # prance is used by st2-validate-api-spec to validate the openapi spec
 # prance needs flex, but do not use the extra as that gets an old version.
 prance
@@ -60,7 +62,7 @@ requests[security]
 retrying
 routes
 semver
-# setuptools provides pkg_resources
+# setuptools provides pkg_resources (and we need it with pip at runtime)
 setuptools
 simplejson
 six
@@ -82,6 +84,8 @@ unittest2
 virtualenv
 webob
 webtest
+# we use pip+wheel at runtime
+wheel
 # zstandard is used for micro benchmarks
 zstandard
 

requirements-pants.txt

@@ -25,6 +25,13 @@ st2_shell_sources_and_resources(
         # st2-run-pack-tests creates its own virtualenv on the fly and
         # installs its dependencies, so most don't need to be listed here.
         # It can optionally use the deps installed with st2tests package.
-        # "st2-run-pack-tests": dict(),
+        "st2-run-pack-tests": dict(
+            dependencies=[
+                "//:reqs#virtualenv",
+                "//:reqs#pip",
+                "//:reqs#setuptools",
+                "//:reqs#wheel",
+            ],
+        ),
     },
 )

st2common/bin/BUILD

@@ -1,4 +1,16 @@
-python_sources()
+python_sources(
+    overrides={
+        "virtualenvs.py": dict(
+            dependencies=[
+                # make sure virtualenvs.py always has functioning virtualenv+pip
+                "//:reqs#virtualenv",
+                "//:reqs#pip",
+                "//:reqs#setuptools",
+                "//:reqs#wheel",
+            ],
+        ),
+    },
+)
 
 # st2common.utils.concurrency allows using gevent instead of eventlet.
 # This gevent support is WIP.