diff --git a/BUILD b/BUILD
index 0112a2cba2..166f72c009 100644
--- a/BUILD
+++ b/BUILD
@@ -1,16 +1,6 @@
 python_requirements(
     name="reqs",
     source="requirements-pants.txt",
-    # module_mapping can be removed once pants is released with
-    # https://github.com/pantsbuild/pants/pull/17390
-    module_mapping={
-        "python-editor": ["editor"],
-        "python-json-logger": ["pythonjsonlogger"],
-        "python-statsd": ["statsd"],
-        "sseclient-py": ["sseclient"],
-        "oslo.config": ["oslo_config"],
-        "RandomWords": ["random_words"],
-    },
     overrides={
         # flex and stevedore uses pkg_resources w/o declaring the dep
         ("flex", "stevedore"): {
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e54f3c40f5..748df0e577 100644
--- a/CHANGELOG.rst
+++ b/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
+  #5931 #5932
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/contrib/core/BUILD b/contrib/core/BUILD
index b59086b916..7db2dc9d25 100644
--- a/contrib/core/BUILD
+++ b/contrib/core/BUILD
@@ -5,9 +5,6 @@ pack_metadata(
 python_requirements(
     name="reqs",
     source="requirements-tests.txt",
-    # module_mapping can be removed once pants is released with
-    # https://github.com/pantsbuild/pants/pull/17390
-    module_mapping={"mail-parser": ["mailparser"]},
 )
 
 python_sources(
diff --git a/contrib/packs/tests/BUILD b/contrib/packs/tests/BUILD
index 5d5a44ba64..86783f843c 100644
--- a/contrib/packs/tests/BUILD
+++ b/contrib/packs/tests/BUILD
@@ -1,11 +1,3 @@
 python_tests(
     skip_pylint=True,
-    overrides={
-        "test_action_download.py": {
-            "dependencies": [
-                # imports tests.fixtures which is ambiguous. Tell pants which one to use.
-                "./fixtures",
-            ],
-        }
-    },
 )
diff --git a/contrib/runners/orquesta_runner/tests/unit/BUILD b/contrib/runners/orquesta_runner/tests/unit/BUILD
index 772d9fbddb..4f770ec875 100644
--- a/contrib/runners/orquesta_runner/tests/unit/BUILD
+++ b/contrib/runners/orquesta_runner/tests/unit/BUILD
@@ -5,10 +5,6 @@ __defaults__(
 
 python_tests(
     name="tests",
-    dependencies=[
-        # most files import tests.unit.base which is ambiguous. Tell pants which one to use.
-        "contrib/runners/orquesta_runner/tests/unit/base.py",
-    ],
 )
 
 python_test_utils(
diff --git a/lockfiles/pants-plugins.lock b/lockfiles/pants-plugins.lock
index fa10a530a8..40fddd1b91 100644
--- a/lockfiles/pants-plugins.lock
+++ b/lockfiles/pants-plugins.lock
@@ -9,8 +9,8 @@
 //     "CPython<3.10,>=3.7"
 //   ],
 //   "generated_with_requirements": [
-//     "pantsbuild.pants.testutil<2.16,>=2.15.0a0",
-//     "pantsbuild.pants<2.16,>=2.15.0a0"
+//     "pantsbuild.pants.testutil<2.17,>=2.16.0a0",
+//     "pantsbuild.pants<2.17,>=2.16.0a0"
 //   ],
 //   "manylinux": "manylinux2014",
 //   "requirement_constraints": [],
@@ -114,204 +114,204 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24",
-              "url": "https://files.pythonhosted.org/packages/68/2b/02e9d6a98ddb73fa238d559a9edcc30b247b8dc4ee848b6184c936e99dc0/charset_normalizer-3.0.1-py3-none-any.whl"
+              "hash": "3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d",
+              "url": "https://files.pythonhosted.org/packages/ef/81/14b3b8f01ddaddad6cdec97f2f599aa2fa466bd5ee9af99b08b7713ccd29/charset_normalizer-3.1.0-py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8",
-              "url": "https://files.pythonhosted.org/packages/00/35/830c29e5dab61932224c7a6c89427090164a3e425cf03486ce7a3ce60623/charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl"
+              "hash": "3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28",
+              "url": "https://files.pythonhosted.org/packages/00/47/f14533da238134f5067fb1d951eb03d5c4be895d6afb11c7ebd07d111acb/charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820",
-              "url": "https://files.pythonhosted.org/packages/03/5e/e81488c74e86eef85cf085417ed945da2dcca87ed22d76202680c16bd3c3/charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl"
+              "hash": "3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb",
+              "url": "https://files.pythonhosted.org/packages/01/c7/0407de35b70525dba2a58a2724a525cf882ee76c3d2171d834463c5d2881/charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42",
-              "url": "https://files.pythonhosted.org/packages/0e/d3/c5fa421dc69bb77c581ed561f1ec6656109c97731ad1128aa93d8bad3053/charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl"
+              "hash": "38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e",
+              "url": "https://files.pythonhosted.org/packages/12/68/4812f9b05ac0a2b7619ac3dd7d7e3fc52c12006b84617021c615fc2fcf42/charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3",
-              "url": "https://files.pythonhosted.org/packages/0f/45/f462f534dd2853ebbc186ed859661db454665b1dc9ae6c690d982153cda9/charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl"
+              "hash": "f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326",
+              "url": "https://files.pythonhosted.org/packages/13/b7/21729a6d512246aa0bb872b90aea0d9fcd1b293762cdb1d1d33c01140074/charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14",
-              "url": "https://files.pythonhosted.org/packages/16/bd/671f11f920dfb46de848e9176d84ddb25b3bbdffac6751cbbf691c0b5b17/charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl"
+              "hash": "10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230",
+              "url": "https://files.pythonhosted.org/packages/1c/9b/de2adc43345623da8e7c958719528a42b6d87d2601017ce1187d43b8a2d7/charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f",
-              "url": "https://files.pythonhosted.org/packages/17/67/4b25c0358a2e812312b551e734d58855d58f47d0e0e9d1573930003910cb/charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl"
+              "hash": "d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854",
+              "url": "https://files.pythonhosted.org/packages/1f/be/c6c76cf8fcf6918922223203c83ba8192eff1c6a709e8cfec7f5ca3e7d2d/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58",
-              "url": "https://files.pythonhosted.org/packages/17/da/fdf8ffc33716c82cae06008159a55a581fa515e8dd02e3395dcad42ff83d/charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+              "hash": "1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649",
+              "url": "https://files.pythonhosted.org/packages/2c/2f/ec805104098085728b7cb610deede7195c6fa59f51942422f02cc427b6f6/charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b",
-              "url": "https://files.pythonhosted.org/packages/20/a2/16b2cbf5f73bdd10624b94647b85c008ba25059792a5c7b4fdb8358bceeb/charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+              "hash": "80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b",
+              "url": "https://files.pythonhosted.org/packages/31/8b/81c3515a69d06b501fcce69506af57a7a19bd9f42cabd1a667b1b40f2c55/charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c",
-              "url": "https://files.pythonhosted.org/packages/25/19/298089cef2eb82fd3810d982aa239d4226594f99e1fe78494cb9b47b03c9/charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl"
+              "hash": "ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11",
+              "url": "https://files.pythonhosted.org/packages/33/10/c87ba15f779f8251ae55fa147631339cd91e7af51c3c133d2687c6e41800/charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc",
-              "url": "https://files.pythonhosted.org/packages/25/b5/f477e419b06e49f3bae446cbdc1fd71d2599be8b12b4d45c641c5a4495b1/charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+              "hash": "21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706",
+              "url": "https://files.pythonhosted.org/packages/33/97/9967fb2d364a9da38557e4af323abcd58cc05bdd8f77e9fd5ae4882772cc/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d",
-              "url": "https://files.pythonhosted.org/packages/31/06/f6330ee70c041a032ee1a5d32785d69748cfa41f64b6d327cc08cae51de9/charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl"
+              "hash": "b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f",
+              "url": "https://files.pythonhosted.org/packages/45/3d/fa2683f5604f99fba5098a7313e5d4846baaecbee754faf115907f21a85f/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e",
-              "url": "https://files.pythonhosted.org/packages/31/af/67b7653a35dbd56f6bb9ff54652a551eae8420d1d0545f0042c5bdb15fb0/charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl"
+              "hash": "ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0",
+              "url": "https://files.pythonhosted.org/packages/4e/11/f7077d78b18aca8ea3186a706c0221aa2bc34c442a3d3bdf3ad401a29052/charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174",
-              "url": "https://files.pythonhosted.org/packages/37/60/7a01f3a129d1af1f26ab2c56aae89a72dbf33fd46a467c1aa994ec62b90b/charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+              "hash": "74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d",
+              "url": "https://files.pythonhosted.org/packages/4f/18/92866f050f7114ba38aba4f4a69f83cc2a25dc2e5a8af4b44fd1bfd6d528/charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753",
-              "url": "https://files.pythonhosted.org/packages/56/5d/275fb120957dfe5a2262d04f28bc742fd4bcc2bd270d19bb8757e09737ef/charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl"
+              "hash": "6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7",
+              "url": "https://files.pythonhosted.org/packages/4f/7c/af43743567a7da2a069b4f9fa31874c3c02b963cd1fb84fe1e7568a567e6/charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d",
-              "url": "https://files.pythonhosted.org/packages/5a/d8/9e76846e70e729de85ecc6af21edc584a2adfef202dc5f5ae00a02622e3d/charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl"
+              "hash": "628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d",
+              "url": "https://files.pythonhosted.org/packages/61/e3/ad9ae58b28482d1069eba1edec2be87701f5dd6fd6024a665020d66677a0/charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a",
-              "url": "https://files.pythonhosted.org/packages/5b/e7/5527effca09d873e07e128d3daac7c531203b5105cb4e2956c2b7a8cc41c/charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl"
+              "hash": "e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1",
+              "url": "https://files.pythonhosted.org/packages/67/30/dbab1fe5ab2ce5d3d517ad9936170d896e9687f3860a092519f1fe359812/charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678",
-              "url": "https://files.pythonhosted.org/packages/6a/ab/3a00ecbddabe25132c20c1bd45e6f90c537b5f7a0b5bcaba094c4922928c/charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl"
+              "hash": "73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd",
+              "url": "https://files.pythonhosted.org/packages/68/77/af702eba147ba963b27eb00832cef6b8c4cb9fcf7404a476993876434b93/charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b",
-              "url": "https://files.pythonhosted.org/packages/71/67/79be03bf7ab4198d994c2e8da869ca354487bfa25656b95cf289cf6338a2/charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+              "hash": "de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0",
+              "url": "https://files.pythonhosted.org/packages/74/5f/361202de730532028458b729781b8435f320e31a622c27f30e25eec80513/charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b",
-              "url": "https://files.pythonhosted.org/packages/93/d1/569445a704414e150f198737c245ab96b40d28d5b68045a62c414a5157de/charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl"
+              "hash": "d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c",
+              "url": "https://files.pythonhosted.org/packages/82/b9/51b66a647be8685dee75b7807e0f750edf5c1e4f29bc562ad285c501e3c7/charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f",
-              "url": "https://files.pythonhosted.org/packages/96/d7/1675d9089a1f4677df5eb29c3f8b064aa1e70c1251a0a8a127803158942d/charset-normalizer-3.0.1.tar.gz"
+              "hash": "dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84",
+              "url": "https://files.pythonhosted.org/packages/84/23/f60cda6c70ae922ad78368982f06e7fef258fba833212f26275fe4727dc4/charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541",
-              "url": "https://files.pythonhosted.org/packages/99/24/eb846dc9a797da58e6e5b3b5a71d3ff17264de3f424fb29aaa5d27173b55/charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+              "hash": "6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e",
+              "url": "https://files.pythonhosted.org/packages/94/70/23981e7bf098efbc4037e7c66d28a10e950d9296c08c6dea8ef290f9c79e/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c",
-              "url": "https://files.pythonhosted.org/packages/9c/42/c1ebc736c57459aab28bfb8aa28c6a047796f2ea46050a3b129b4920dbe4/charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl"
+              "hash": "c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f",
+              "url": "https://files.pythonhosted.org/packages/9a/f1/ff81439aa09070fee64173e6ca6ce1342f2b1cca997bcaae89e443812684/charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087",
-              "url": "https://files.pythonhosted.org/packages/a2/93/0b1aa4dbc0ae2aa2e1b2e6d037ab8984dc09912d6b26d63ced14da07e3a7/charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl"
+              "hash": "0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e",
+              "url": "https://files.pythonhosted.org/packages/a2/6c/5167f08da5298f383036c33cb749ab5b3405fd07853edc8314c6882c01b8/charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e",
-              "url": "https://files.pythonhosted.org/packages/a2/a7/adc963ad8f8fddadd6be088e636972705ec9d1d92d1b45e6119eb02b7e9e/charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl"
+              "hash": "1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d",
+              "url": "https://files.pythonhosted.org/packages/a4/03/355281b62c26712a50c6a9dd75339d8cdd58488fd7bf2556ba1320ebd315/charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918",
-              "url": "https://files.pythonhosted.org/packages/a3/09/a837b27b122e710dfad15b0b5df04cd0623c8d8d3382e4298f50798fb84a/charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl"
+              "hash": "53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f",
+              "url": "https://files.pythonhosted.org/packages/a9/83/138d2624fdbcb62b7e14715eb721d44347e41a1b4c16544661e940793f49/charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479",
-              "url": "https://files.pythonhosted.org/packages/aa/a4/2d6255d4db5d4558a92458fd8dacddfdda2fb4ad9c0a87db6f6034aded34/charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl"
+              "hash": "8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f",
+              "url": "https://files.pythonhosted.org/packages/ac/7f/62d5dff4e9cb993e4b0d4ea78a74cc84d7d92120879529e0ce0965765936/charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b",
-              "url": "https://files.pythonhosted.org/packages/b5/1a/932d86fde86bb0d2992c74552c9a422883fe0890132bbc9a5e2211f03318/charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+              "hash": "3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c",
+              "url": "https://files.pythonhosted.org/packages/ac/c5/990bc41a98b7fa2677c665737fdf278bb74ad4b199c56b6b564b3d4cbfc5/charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866",
-              "url": "https://files.pythonhosted.org/packages/c1/b2/d81606aebeb7e9a33dc877ff3a206c9946f5bb374c99d22d4a28825aa270/charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+              "hash": "6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8",
+              "url": "https://files.pythonhosted.org/packages/b0/55/d8ef4c8c7d2a8b3a16e7d9b03c59475c2ee96a0e0c90b14c99faaac0ee3b/charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579",
-              "url": "https://files.pythonhosted.org/packages/c4/d4/94f1ea460cce04483d2460efba6fd4d66e6f60ad6fc6075dba13e3501e48/charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl"
+              "hash": "6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31",
+              "url": "https://files.pythonhosted.org/packages/d5/92/86c0f0e66e897f6818c46dadef328a5b345d061688f9960fc6ca1fd03dbe/charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1",
-              "url": "https://files.pythonhosted.org/packages/c8/a2/8f873138c99423de3b402daf8ccd7a538632c83d0c129444a6a18ef34e03/charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+              "hash": "7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14",
+              "url": "https://files.pythonhosted.org/packages/d8/ca/a7ff600781bf1e5f702ba26bb82f2ba1d3a873a3f8ad73cc44c79dfaefa9/charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4",
-              "url": "https://files.pythonhosted.org/packages/c9/dd/80a5e8c080b7e1cc2b0ca35f0d6aeedafd7bbd06d25031ac20868b1366d6/charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl"
+              "hash": "ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9",
+              "url": "https://files.pythonhosted.org/packages/dd/39/6276cf5a395ffd39b77dadf0e2fcbfca8dbfe48c56ada250c40086055143/charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca",
-              "url": "https://files.pythonhosted.org/packages/dc/ff/2c7655d83b1d6d6a0e132d50d54131fcb8da763b417ccc6c4a506aa0e08c/charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+              "hash": "0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373",
+              "url": "https://files.pythonhosted.org/packages/e1/b4/53678b2a14e0496fc167fe9b9e726ad33d670cfd2011031aa5caeee6b784/charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d",
-              "url": "https://files.pythonhosted.org/packages/df/2f/4806e155191f75e720aca98a969581c6b2676f0379dd315c34c388bbf8b5/charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+              "hash": "e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531",
+              "url": "https://files.pythonhosted.org/packages/ea/38/d31c7906c4be13060c1a5034087966774ef33ab57ff2eee76d71265173c3/charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3",
-              "url": "https://files.pythonhosted.org/packages/e3/96/8cdbce165c96cce5f2c9c7748f7ed8e0cf0c5d03e213bbc90b7c3e918bf5/charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+              "hash": "fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab",
+              "url": "https://files.pythonhosted.org/packages/f2/b7/e21e16c98575616f4ce09dc766dbccdac0ca119c176b184d46105e971a84/charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed",
-              "url": "https://files.pythonhosted.org/packages/e8/80/141f6af05332cbb811ab469f64deb1e1d4cc9e8b0c003aa8a38d689ce84a/charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl"
+              "hash": "3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e",
+              "url": "https://files.pythonhosted.org/packages/f6/0f/de1c4030fd669e6719277043e3b0f152a83c118dd1020cf85b51d443d04a/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291",
-              "url": "https://files.pythonhosted.org/packages/f1/ff/9a1c65d8c44958f45ae40cd558ab63bd499a35198a2014e13c0887c07ed1/charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl"
+              "hash": "78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b",
+              "url": "https://files.pythonhosted.org/packages/f8/ed/500609cb2457b002242b090c814549997424d72690ef3058cfdfca91f68b/charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be",
-              "url": "https://files.pythonhosted.org/packages/f5/84/cac681144a28114bd9e40d3cdbfd961c14ecc2b56f1baec2094afd6744c7/charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl"
+              "hash": "04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6",
+              "url": "https://files.pythonhosted.org/packages/fa/8e/2e5c742c3082bce3eea2ddd5b331d08050cda458bc362d71c48e07a44719/charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786",
-              "url": "https://files.pythonhosted.org/packages/f5/ec/a9bed59079bd0267d34ada58a4048c96a59b3621e7f586ea85840d41831d/charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl"
+              "hash": "34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5",
+              "url": "https://files.pythonhosted.org/packages/ff/d7/8d757f8bd45be079d76309248845a04f09619a7b17d6dfc8c9ff6433cac2/charset-normalizer-3.1.0.tar.gz"
             }
           ],
           "project_name": "charset-normalizer",
           "requires_dists": [],
-          "requires_python": null,
-          "version": "3.0.1"
+          "requires_python": ">=3.7.0",
+          "version": "3.1.0"
         },
         {
           "artifacts": [
@@ -631,38 +631,53 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "f1b2c0710f747d0188c57596b0a3a57019f28d75a5c626f1b79a0830567ad2a2",
-              "url": "https://files.pythonhosted.org/packages/0c/04/ddba920ad27fd039e3af81190a149ae7a26b86bdb0f7d8242347954963df/pantsbuild.pants-2.15.0-cp39-cp39-manylinux2014_x86_64.whl"
+              "hash": "004a0b8be203d05c19db2919c9e2ce9f0e259dbdc4550f53fd1987d11a1c91bd",
+              "url": "https://files.pythonhosted.org/packages/7e/e0/007dbe28b8136a1bbe14a8223b8c8daa09fb9616ca9dc19ffbdb405e715e/pantsbuild.pants-2.16.0a0-cp39-cp39-manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "834f4750febdf5f17868b57d78163a4c3469ccae93f97cb2dbc0adc94cad4c48",
+              "url": "https://files.pythonhosted.org/packages/10/58/4ec4de0c3043bfa4011599654c2663faac783a7902e9c8328b2083178b5e/pantsbuild.pants-2.16.0a0-cp37-cp37m-manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "15a9fa7e22921c80cafe0374a366a7e655a3871f376b90de7d9d19371e1182b1",
+              "url": "https://files.pythonhosted.org/packages/27/bf/8157c686f63601200b63ae829c0841af9b5605f0f03752c6316c172148db/pantsbuild.pants-2.16.0a0-cp38-cp38-macosx_10_15_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "78568752d0105e9871300023c901a2c2ef252fadb2e08c2a5371d3a461200f1a",
-              "url": "https://files.pythonhosted.org/packages/28/52/5bd6112335602c44b39a4fef4d66227b165297ceab401e26d91eb6a9915e/pantsbuild.pants-2.15.0-cp37-cp37m-manylinux2014_x86_64.whl"
+              "hash": "4af3caec0de82c1444fc4a5d7f02d69572962da27feffa4509a2c9ce3cd03f6d",
+              "url": "https://files.pythonhosted.org/packages/41/b2/eadeb13e9ba9d4a1f31f83e0f0553f5e01ad74cbe1e0621c175882ba4c71/pantsbuild.pants-2.16.0a0-cp39-cp39-macosx_10_15_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "79de2888e61215f70ad6c990522c62507fbdbb425975ce37938e7637379168bc",
-              "url": "https://files.pythonhosted.org/packages/38/ca/8501babe1afe2bb3be5fe1b59ca32feb619dd06cf4016b56b54e3a061cb9/pantsbuild.pants-2.15.0-cp38-cp38-manylinux2014_x86_64.whl"
+              "hash": "a6a30ff967004ab81b809b0e6af6d21867c6ddea8b7964fd164abee0adf62632",
+              "url": "https://files.pythonhosted.org/packages/74/f8/560d8d9c03ad9d228463e1fc5cd8f0080fb36d7260483f74a2bbd15d908f/pantsbuild.pants-2.16.0a0-cp39-cp39-macosx_11_0_arm64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "e360dc85e75771b06a329bf2b792a0e43c57c8d19c9f4dc1f95ecf60f2c22681",
-              "url": "https://files.pythonhosted.org/packages/a7/bd/020178714348a6535ff06f00752a6297a393f3b863572b56a6cb75a6e452/pantsbuild.pants-2.15.0-cp37-cp37m-macosx_10_15_x86_64.whl"
+              "hash": "054db42f5230f424789b3b43610da8a7ce0e69f07254b7d54c4fe5a8a4e293b6",
+              "url": "https://files.pythonhosted.org/packages/7c/93/285b44577e470b406b2ddf2c2f1f947fc58f405c4c6fed535bcf14a6c378/pantsbuild.pants-2.16.0a0-cp38-cp38-manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "5b0e83308297948f19173bf507e796d89e57649445cdb9b36002353c5e13c9c1",
-              "url": "https://files.pythonhosted.org/packages/b4/82/89d32a12eed118ed7003e892c6295a35449d94deb02b72afbc0b22a8107e/pantsbuild.pants-2.15.0-cp39-cp39-macosx_11_0_arm64.whl"
+              "hash": "a491f892d5ad6cee970549324c85cba9228e04d96309034bc9a5763efa0a3c91",
+              "url": "https://files.pythonhosted.org/packages/a3/7c/a34d4292cea34c0f7af618511a56abfc3b44f3cb2278012d33434f7e7262/pantsbuild.pants-2.16.0a0-cp37-cp37m-macosx_10_15_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "c0d5e2afc5093e01cd54a7a6c2844aa7ec8cacbff013ff92d837568113113590",
-              "url": "https://files.pythonhosted.org/packages/f4/48/be06b39e592cae9b3a9cf683d4d30a23ab408c3b823e8554462539bf31e8/pantsbuild.pants-2.15.0-cp39-cp39-macosx_10_15_x86_64.whl"
+              "hash": "9aeb3ab0473fc959959fb366822127a3c47f60a5b49e4ffa1f82c584abfc0510",
+              "url": "https://files.pythonhosted.org/packages/a4/a0/3009303480b479cfb824e3e93cf58f9df8bd8f91f83b790ef3e93c372d7b/pantsbuild.pants-2.16.0a0-cp37-cp37m-manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "127ab727c6a5254b023fb4ce4abacadfee71fd15680ca063607e58987b9b30cf",
-              "url": "https://files.pythonhosted.org/packages/f9/e9/11ebc51d7fa429c1f92392548dc71c3e62c1bce57763291a9521e96ff9b7/pantsbuild.pants-2.15.0-cp38-cp38-macosx_10_15_x86_64.whl"
+              "hash": "6ad74d48564ef46646f1bc189ddd3ad43fef44453fb7ecca6b0c50f85e860030",
+              "url": "https://files.pythonhosted.org/packages/c8/55/131e098f687a2d4cda67e053d52b7dfc155ebb9d4384a191cff1a2210565/pantsbuild.pants-2.16.0a0-cp39-cp39-manylinux2014_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "9516a80ad6def8f147a9bc1c3710ef38b8c714b3c735a9bedf06bf7052688a76",
+              "url": "https://files.pythonhosted.org/packages/dc/8c/65d81bb187dbb2909c51586553e8c76719592cedf5413c6a515c5d7cb5d6/pantsbuild.pants-2.16.0a0-cp38-cp38-manylinux2014_aarch64.whl"
             }
           ],
           "project_name": "pantsbuild-pants",
@@ -675,10 +690,10 @@
             "ijson==3.1.4",
             "importlib-resources==5.0.*",
             "packaging==21.3",
-            "pex==2.1.111",
+            "pex==2.1.126",
             "psutil==5.9.0",
             "python-lsp-jsonrpc==1.0.0",
-            "setproctitle==1.2.2",
+            "setproctitle==1.3.2",
             "setuptools<64.0,>=63.1.0",
             "toml==0.10.2",
             "types-PyYAML==6.0.3",
@@ -687,35 +702,35 @@
             "typing-extensions==4.3.0"
           ],
           "requires_python": "<3.10,>=3.7",
-          "version": "2.15.0"
+          "version": "2.16.0a0"
         },
         {
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "1502b9261668d4772cfff0bf7956c4400edf8feb9025fc5e024f19d4b84edab0",
-              "url": "https://files.pythonhosted.org/packages/1c/d4/49be72adb6aea5464a28767d5e3b726057b2a8e5d20388210f1cd052eddd/pantsbuild.pants.testutil-2.15.0-py3-none-any.whl"
+              "hash": "5ccc55209f86c7d9865692196c9439bfe4922c7481c70c497aee11c79b0686f1",
+              "url": "https://files.pythonhosted.org/packages/44/43/975340a69e502c3225c3a992888a0183a227065c849eaa5fc850bd773c14/pantsbuild.pants.testutil-2.16.0a0-py3-none-any.whl"
             }
           ],
           "project_name": "pantsbuild-pants-testutil",
           "requires_dists": [
-            "pantsbuild.pants==2.15.0",
+            "pantsbuild.pants==2.16.0a0",
             "pytest<7.1.0,>=6.2.4"
           ],
           "requires_python": "<3.10,>=3.7",
-          "version": "2.15.0"
+          "version": "2.16.0a0"
         },
         {
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "3ac1ae69dfca900b41853f80d3ab0530bdb40e578a8274245fa0bf4a4a748316",
-              "url": "https://files.pythonhosted.org/packages/5d/08/89438cc626ec77a6f7dc3ab17cad581d14882a2f51a37d24c8a4c127e7bc/pex-2.1.111-py2.py3-none-any.whl"
+              "hash": "fef7b5536bc07a69388b64a419164b573e25d4aeae503091d832cb5603438e99",
+              "url": "https://files.pythonhosted.org/packages/66/43/8c5d97f4acbfb38fd3a0e46f235e6e9d9d20f224dffacecd2bb76093e3fd/pex-2.1.126-py2.py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "0bb8a122dc3db515f369a0f7581653d879e27e7652ffffe900e0e6c66a7fb15c",
-              "url": "https://files.pythonhosted.org/packages/1e/f2/7e05a54dd2655608e6ccadba75f79e9531cfefeb57ba06a4a250ee6fb736/pex-2.1.111.tar.gz"
+              "hash": "3fcd6cf993815f2a2ad1d826ea194e35bca3c82f485f9886e9e681e400566b15",
+              "url": "https://files.pythonhosted.org/packages/75/b5/f12684a46ede450a44fa985ece3a310478208a7ff866c24b8b0b6e1ea089/pex-2.1.126.tar.gz"
             }
           ],
           "project_name": "pex",
@@ -723,7 +738,7 @@
             "subprocess32>=3.2.7; extra == \"subprocess\" and python_version < \"3\""
           ],
           "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<3.12,>=2.7",
-          "version": "2.1.111"
+          "version": "2.1.126"
         },
         {
           "artifacts": [
@@ -1021,61 +1036,206 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "3f6136966c81daaf5b4b010613fe33240a045a4036132ef040b623e35772d998",
-              "url": "https://files.pythonhosted.org/packages/69/ed/20c8af2af9ec869696e8a4a777b920d9e7c7c7ce5f3f34444329f84d5953/setproctitle-1.2.2-cp39-cp39-manylinux2014_aarch64.whl"
+              "hash": "65d884e22037b23fa25b2baf1a3316602ed5c5971eb3e9d771a38c3a69ce6e13",
+              "url": "https://files.pythonhosted.org/packages/8d/f0/7d0999aaa3efb1d5e4f1bb7d7a0fee133e94a70e0780c3032e6cc19c66da/setproctitle-1.3.2-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "a149a5f7f2c5a065d4e63cb0d7a4b6d3b66e6e80f12e3f8827c4f63974cbf122",
+              "url": "https://files.pythonhosted.org/packages/02/9c/48155692325ff7ca9b841cfc7894ea6770c4a24455f8775959916f08e723/setproctitle-1.3.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "5b932c3041aa924163f4aab970c2f0e6b4d9d773f4d50326e0ea1cd69240e5c5",
+              "url": "https://files.pythonhosted.org/packages/09/7b/d8aa13b2ca77541a6ec99edfec4f6f9372c32016355001f16cb2ab691404/setproctitle-1.3.2-cp38-cp38-macosx_10_9_universal2.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "1c8d9650154afaa86a44ff195b7b10d683c73509d085339d174e394a22cccbb9",
+              "url": "https://files.pythonhosted.org/packages/22/74/bdedbb32ca2b85a6eb23afacfd83cf4b4a9334d91e33b178812cf1d3db58/setproctitle-1.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "e1aafc91cbdacc9e5fe712c52077369168e6b6c346f3a9d51bf600b53eae56bb",
+              "url": "https://files.pythonhosted.org/packages/25/e4/39f9b58efd84149a56ac1bb9ceec2ba8ae7efd90f83ba1b87752a6a9c5f0/setproctitle-1.3.2-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "c8a09d570b39517de10ee5b718730e171251ce63bbb890c430c725c8c53d4484",
+              "url": "https://files.pythonhosted.org/packages/29/0b/715f78956a4910dbf7c3aaa6a8246e5d225fdb4ac1127689d9ba6e6896be/setproctitle-1.3.2-cp38-cp38-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "e13a5c1d9c369cb11cdfc4b75be432b83eb3205c95a69006008ffd4366f87b9e",
-              "url": "https://files.pythonhosted.org/packages/21/8a/32fdafc0664c681507df24dbaa7c28f823a5289f03e663c51dae7f3a3278/setproctitle-1.2.2-cp38-cp38-manylinux1_i686.whl"
+              "hash": "b34baef93bfb20a8ecb930e395ccd2ae3268050d8cf4fe187de5e2bd806fd796",
+              "url": "https://files.pythonhosted.org/packages/29/0f/884a680fed30dbd1f99fba1f0ae189a1bc7026246150a1b4a5492108c231/setproctitle-1.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "c611f65bc9de5391a1514de556f71101e6531bb0715d240efd3e9732626d5c9e",
-              "url": "https://files.pythonhosted.org/packages/3c/dc/00fb59a01ed15134e6ccdd450e629418431fe9a6433b2ee9479c27660ae3/setproctitle-1.2.2-cp38-cp38-manylinux1_x86_64.whl"
+              "hash": "7fe9df7aeb8c64db6c34fc3b13271a363475d77bc157d3f00275a53910cb1989",
+              "url": "https://files.pythonhosted.org/packages/39/2e/65a12b007d579a8d5fab6e50198a2ad7bbda9c6d304a69796a062426d913/setproctitle-1.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "970798d948f0c90a3eb0f8750f08cb215b89dcbee1b55ffb353ad62d9361daeb",
-              "url": "https://files.pythonhosted.org/packages/5e/59/f9fef4d0682ff03a392365322d160d8ca5257a0a782b93cea7cb7658e53e/setproctitle-1.2.2-cp39-cp39-manylinux1_x86_64.whl"
+              "hash": "faec934cfe5fd6ac1151c02e67156c3f526e82f96b24d550b5d51efa4a5527c6",
+              "url": "https://files.pythonhosted.org/packages/3c/15/82ec06f392cee2670e16ac35a59f44723cf72103d19407cbb071b5850201/setproctitle-1.3.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "bc4393576ed3ac87ddac7d1bd0faaa2fab24840a025cc5f3c21d14cf0c9c8a12",
-              "url": "https://files.pythonhosted.org/packages/7d/e1/761a1e90ac68b92e296025e7e93b24f4e0f46f92d5ae86108228312f2b22/setproctitle-1.2.2-cp38-cp38-manylinux2014_aarch64.whl"
+              "hash": "2e3ac25bfc4a0f29d2409650c7532d5ddfdbf29f16f8a256fc31c47d0dc05172",
+              "url": "https://files.pythonhosted.org/packages/41/c7/107d46b676592ce508bd0ad3ac3b94acb1754460f375eccaba6e151375a8/setproctitle-1.3.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "e696c93d93c23f377ccd2d72e38908d3dbfc90e45561602b805f53f2627d42ea",
-              "url": "https://files.pythonhosted.org/packages/97/5c/16a6e69febfbee3f1a1a8c4318d1f054ff4d3ef2a61b233937c316cba06d/setproctitle-1.2.2-cp37-cp37m-manylinux1_x86_64.whl"
+              "hash": "fed18e44711c5af4b681c2b3b18f85e6f0f1b2370a28854c645d636d5305ccd8",
+              "url": "https://files.pythonhosted.org/packages/42/69/5495ee592ad6c6411c9d1f1d610e37557f14fa5d039ef82bf86f328ca289/setproctitle-1.3.2-cp39-cp39-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "7dfb472c8852403d34007e01d6e3c68c57eb66433fb8a5c77b13b89a160d97df",
-              "url": "https://files.pythonhosted.org/packages/a1/7f/a1d4f4c7b66f0fc02f35dc5c85f45a8b4e4a7988357a29e61c14e725ef86/setproctitle-1.2.2.tar.gz"
+              "hash": "4058564195b975ddc3f0462375c533cce310ccdd41b80ac9aed641c296c3eff4",
+              "url": "https://files.pythonhosted.org/packages/4a/a4/cb6c3d274e8f5c36c65590723d58f994f407a0c835ac94379c00b89df4dd/setproctitle-1.3.2-cp39-cp39-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "ba1fb32e7267330bd9f72e69e076777a877f1cb9be5beac5e62d1279e305f37f",
-              "url": "https://files.pythonhosted.org/packages/b1/10/8ec969cd05fb952dc876dd74d01eff0acda9b50f44f9f80e957eaa14073d/setproctitle-1.2.2-cp37-cp37m-manylinux1_i686.whl"
+              "hash": "f0452282258dfcc01697026a8841258dd2057c4438b43914b611bccbcd048f10",
+              "url": "https://files.pythonhosted.org/packages/4b/b1/95367ba12415e48f331379032fe8060c56fbddc0b74838d1c6668e031a44/setproctitle-1.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "077943272d0490b3f43d17379432d5e49c263f608fdf4cf624b419db762ca72b",
-              "url": "https://files.pythonhosted.org/packages/b6/5d/c09df79458318acf027e9ccab1b8c13a26314fba302de35ca0aa7f21f76e/setproctitle-1.2.2-cp39-cp39-manylinux1_i686.whl"
+              "hash": "de3a540cd1817ede31f530d20e6a4935bbc1b145fd8f8cf393903b1e02f1ae76",
+              "url": "https://files.pythonhosted.org/packages/50/ef/cff921345cadf05bef3cb4da37eac23d08fd063222a633231e8ae1f61a0d/setproctitle-1.3.2-cp39-cp39-macosx_10_9_universal2.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "fbf914179dc4540ee6bfd8228b4cc1f1f6fb12dad66b72b5c9b955b222403220",
-              "url": "https://files.pythonhosted.org/packages/d4/49/65d5f5f9fd9e763f3aa9ceb4bb5109a6572851a98c74a01a5e968ac22adc/setproctitle-1.2.2-cp37-cp37m-manylinux2014_aarch64.whl"
+              "hash": "589be87172b238f839e19f146b9ea47c71e413e951ef0dc6db4218ddacf3c202",
+              "url": "https://files.pythonhosted.org/packages/5c/48/ac39c43ca8709b23f8410a6e483e89a836f02c082b77134441d12502f380/setproctitle-1.3.2-cp38-cp38-musllinux_1_1_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "ffc61a388a5834a97953d6444a2888c24a05f2e333f9ed49f977a87bb1ad4761",
+              "url": "https://files.pythonhosted.org/packages/66/b0/bb81bad3120364523b1a9511564f6ec6f5de322400cd5f3ebef526d40c23/setproctitle-1.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "1f29b75e86260b0ab59adb12661ef9f113d2f93a59951373eb6d68a852b13e83",
+              "url": "https://files.pythonhosted.org/packages/6a/40/ee7b7fcf19ef1befc3c716a2ca8b6fa8dd35815b7eef838a14bf135275d3/setproctitle-1.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "fcd3cf4286a60fdc95451d8d14e0389a6b4f5cebe02c7f2609325eb016535963",
+              "url": "https://files.pythonhosted.org/packages/71/53/f0e0b2e635ffaba4a1822a5a3c11acda4f6d997feed8692db7c5cc1502ad/setproctitle-1.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "5194b4969f82ea842a4f6af2f82cd16ebdc3f1771fb2771796e6add9835c1973",
+              "url": "https://files.pythonhosted.org/packages/76/dd/f0b702d3a2ada49307b958e9cff6c3d9215a325da46380e983ddf23969bd/setproctitle-1.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "9124bedd8006b0e04d4e8a71a0945da9b67e7a4ab88fdad7b1440dc5b6122c42",
+              "url": "https://files.pythonhosted.org/packages/82/0d/eecf43456f202bb8342bbe7a8e441f5e6245f99894c7955936acc67a4f2b/setproctitle-1.3.2-cp38-cp38-musllinux_1_1_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "c91b9bc8985d00239f7dc08a49927a7ca1ca8a6af2c3890feec3ed9665b6f91e",
+              "url": "https://files.pythonhosted.org/packages/8e/26/904b99ea77b569a2e85331f710f8374d7f2c668914dd71f5062fdc5027a3/setproctitle-1.3.2-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "1c5d5dad7c28bdd1ec4187d818e43796f58a845aa892bb4481587010dc4d362b",
+              "url": "https://files.pythonhosted.org/packages/9a/12/cc8c117c13319e7c56aea7c33d127150e538da7e9a4808aa91e07d424610/setproctitle-1.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "1ff863a20d1ff6ba2c24e22436a3daa3cd80be1dfb26891aae73f61b54b04aca",
+              "url": "https://files.pythonhosted.org/packages/9c/67/e8872c89efca609954185f1089d596b206a33d6a8e31f7295a4b5cd05468/setproctitle-1.3.2-cp37-cp37m-musllinux_1_1_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "710e16fa3bade3b026907e4a5e841124983620046166f355bbb84be364bf2a02",
+              "url": "https://files.pythonhosted.org/packages/9e/31/a0f29c88617705b6dc7a72b6cb7a270f1c15b7f53ae99adc592f506fd151/setproctitle-1.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "92c626edc66169a1b09e9541b9c0c9f10488447d8a2b1d87c8f0672e771bc927",
+              "url": "https://files.pythonhosted.org/packages/9f/86/2af288f58d44bd79b9840e8365da0e403c8d76665d5ed16b0b07016a73bf/setproctitle-1.3.2-cp37-cp37m-macosx_10_9_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "8ff3c8cb26afaed25e8bca7b9dd0c1e36de71f35a3a0706b5c0d5172587a3827",
+              "url": "https://files.pythonhosted.org/packages/a6/79/30829bdf3d8825000780f1b9ddcb3970898f30e8fd20c82744ad5ba92bf2/setproctitle-1.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "7f0bed90a216ef28b9d227d8d73e28a8c9b88c0f48a082d13ab3fa83c581488f",
+              "url": "https://files.pythonhosted.org/packages/a9/6e/c50be96334dcb7a63f7fca5897d99f2ae1deee378cec8dbd8a56c3cd4ded/setproctitle-1.3.2-cp39-cp39-musllinux_1_1_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "e8579a43eafd246e285eb3a5b939e7158073d5087aacdd2308f23200eac2458b",
+              "url": "https://files.pythonhosted.org/packages/aa/14/2f09103e288f06a6628447873bb2484538a1fe293f24a7238fa558d3c6cb/setproctitle-1.3.2-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "e49ae693306d7624015f31cb3e82708916759d592c2e5f72a35c8f4cc8aef258",
+              "url": "https://files.pythonhosted.org/packages/af/6b/871ae1b3c7b8c475fc6ad7a1ad6b3bc4465771c2772c7fb5520400f3d4a9/setproctitle-1.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd",
+              "url": "https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc/setproctitle-1.3.2.tar.gz"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "fe8a988c7220c002c45347430993830666e55bc350179d91fcee0feafe64e1d4",
+              "url": "https://files.pythonhosted.org/packages/b7/7e/4f71712c98fd06b3075c93a1a2135c5f656191b2aae30895ca7bc7a0da03/setproctitle-1.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "b617f12c9be61e8f4b2857be4a4319754756845dbbbd9c3718f468bbb1e17bcb",
+              "url": "https://files.pythonhosted.org/packages/c6/19/f317a8a1b3063affae0cd04bed33ddef710f8169a5bb2ae066280ae1ca5d/setproctitle-1.3.2-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "1f0cde41857a644b7353a0060b5f94f7ba7cf593ebde5a1094da1be581ac9a31",
+              "url": "https://files.pythonhosted.org/packages/ce/ea/da374494f0edede3bc098a747e308d40ba737e3b160d3ff46cce05f84c9a/setproctitle-1.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "dad42e676c5261eb50fdb16bdf3e2771cf8f99a79ef69ba88729aeb3472d8575",
+              "url": "https://files.pythonhosted.org/packages/cf/86/07d7d30f25fc59aa6d9c2781c65299e2e056101febf58daa820e7a5b7846/setproctitle-1.3.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "f4bfc89bd33ebb8e4c0e9846a09b1f5a4a86f5cb7a317e75cc42fee1131b4f4f",
+              "url": "https://files.pythonhosted.org/packages/d5/6d/912d49dc1d007daa0d47c21b2d65fa31d97752bf879f9d18381baaf8c180/setproctitle-1.3.2-cp38-cp38-macosx_10_9_x86_64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "bae283e85fc084b18ffeb92e061ff7ac5af9e183c9d1345c93e178c3e5069cbe",
+              "url": "https://files.pythonhosted.org/packages/dd/6e/e920bb0ce7bc7eebdef249643ac3b66dbd9677d668472a86b88149575234/setproctitle-1.3.2-cp39-cp39-musllinux_1_1_aarch64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "5fb4f769c02f63fac90989711a3fee83919f47ae9afd4758ced5d86596318c65",
+              "url": "https://files.pythonhosted.org/packages/e5/94/dd65531001480c9ff83fd374d7e0b3c5343d8b17fc299c941097b8f5c552/setproctitle-1.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "55ce1e9925ce1765865442ede9dca0ba9bde10593fcd570b1f0fa25d3ec6b31c",
+              "url": "https://files.pythonhosted.org/packages/e8/63/21103403a459271b241340381c6763699597dccafc6b9dd6bf75451ab999/setproctitle-1.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "1fa1a0fbee72b47dc339c87c890d3c03a72ea65c061ade3204f285582f2da30f",
+              "url": "https://files.pythonhosted.org/packages/f3/4e/3b13ff5965903911f4e93631fb3ae7419943e0dc77e479b781e34540fae3/setproctitle-1.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             }
           ],
           "project_name": "setproctitle",
           "requires_dists": [
-            "pytest<6.2,>=6.1; extra == \"test\""
+            "pytest; extra == \"test\""
           ],
-          "requires_python": ">=3.6",
-          "version": "1.2.2"
+          "requires_python": ">=3.7",
+          "version": "1.3.2"
         },
         {
           "artifacts": [
@@ -1458,13 +1618,13 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1",
-              "url": "https://files.pythonhosted.org/packages/fe/ca/466766e20b767ddb9b951202542310cba37ea5f2d792dae7589f1741af58/urllib3-1.26.14-py2.py3-none-any.whl"
+              "hash": "aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42",
+              "url": "https://files.pythonhosted.org/packages/7b/f5/890a0baca17a61c1f92f72b81d3c31523c99bec609e60c292ea55b387ae8/urllib3-1.26.15-py2.py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72",
-              "url": "https://files.pythonhosted.org/packages/c5/52/fe421fb7364aa738b3506a2d99e4f3a56e079c0a798e9f4fa5e14c60922f/urllib3-1.26.14.tar.gz"
+              "hash": "8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305",
+              "url": "https://files.pythonhosted.org/packages/21/79/6372d8c0d0641b4072889f3ff84f279b738cd8595b64c8e0496d4e848122/urllib3-1.26.15.tar.gz"
             }
           ],
           "project_name": "urllib3",
@@ -1481,7 +1641,7 @@
             "urllib3-secure-extra; extra == \"secure\""
           ],
           "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7",
-          "version": "1.26.14"
+          "version": "1.26.15"
         },
         {
           "artifacts": [
@@ -1525,12 +1685,12 @@
     }
   ],
   "path_mappings": {},
-  "pex_version": "2.1.111",
+  "pex_version": "2.1.126",
   "pip_version": "20.3.4-patched",
   "prefer_older_binary": false,
   "requirements": [
-    "pantsbuild.pants.testutil<2.16,>=2.15.0a0",
-    "pantsbuild.pants<2.16,>=2.15.0a0"
+    "pantsbuild.pants.testutil<2.17,>=2.16.0a0",
+    "pantsbuild.pants<2.17,>=2.16.0a0"
   ],
   "requires_python": [
     "<3.10,>=3.7"
diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock
index f57074e729..a7d153faf8 100644
--- a/lockfiles/st2.lock
+++ b/lockfiles/st2.lock
@@ -2422,13 +2422,13 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "6bef55b882c9d130f8015b9a26f4bd93f710e90fe7478b9dcc810304e79b3cd8",
-              "url": "https://files.pythonhosted.org/packages/ae/fe/3ab1540ee3f956fed7c738ac60b17586b3e57629a6b8f8dcbb790fca00c2/paramiko-3.0.0-py3-none-any.whl"
+              "hash": "f0caa660e797d9cd10db6fc6ae81e2c9b2767af75c3180fcd0e46158cd368d7f",
+              "url": "https://files.pythonhosted.org/packages/56/7c/9dd558ec0869fcecb661765d0a2504978dbfe85de24cbcccc847aa9b58e4/paramiko-3.1.0-py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "fedc9b1dd43bc1d45f67f1ceca10bc336605427a46dcdf8dec6bfea3edf57965",
-              "url": "https://files.pythonhosted.org/packages/3b/6b/554c00e5e68cd573bda345322a4e895e22686e94c7fa51848cd0e0442a71/paramiko-3.0.0.tar.gz"
+              "hash": "6950faca6819acd3219d4ae694a23c7a87ee38d084f70c1724b0c0dbb8b75769",
+              "url": "https://files.pythonhosted.org/packages/e8/53/e614a5b7bcc658d20e6eff6ae068863becb06bf362c2f135f5c290d8e6a2/paramiko-3.1.0.tar.gz"
             }
           ],
           "project_name": "paramiko",
@@ -2446,7 +2446,7 @@
             "pywin32>=2.1.8; platform_system == \"Windows\" and extra == \"gssapi\""
           ],
           "requires_python": ">=3.6",
-          "version": "3.0.0"
+          "version": "3.1.0"
         },
         {
           "artifacts": [
@@ -3753,134 +3753,164 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "37bdef13412c0bc338db2993a38f3911d5bd2a0ba8d00b3bc66d1063edd7c33e",
-              "url": "https://files.pythonhosted.org/packages/17/62/09219ecd46f057e80e8d814b935f747e539940e07905f4f6aa4296990350/simplejson-3.18.3-py3-none-any.whl"
+              "hash": "03de1ec4ad734f28ca49b0a758b997d752be0d089ed30360157c4e8811999c8f",
+              "url": "https://files.pythonhosted.org/packages/06/fb/346f9fa91d02f342e91e8781a85a72f1c23b73beb0cb08361fd4acdc2816/simplejson-3.18.4-py3-none-any.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "6197cfebe659ac802a686b5408494115a7062b45cdf37679c4d6a9d4f39649b7",
+              "url": "https://files.pythonhosted.org/packages/00/cd/62392cee6e24da6768a578651907c8e08ae316fc931d09ba98e5114d561d/simplejson-3.18.4.tar.gz"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "544e5607142d66a469ecf78a3154ec0f915834dc3b8cfdb2677a78ca58319ad6",
+              "url": "https://files.pythonhosted.org/packages/0a/cc/e44b55bfad937a643fb8dc40a51ba8672da528721a1fbca078c73ae22163/simplejson-3.18.4-cp37-cp37m-musllinux_1_1_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "93ba80fbf959b5852554f23201a5f4b30885930c303546ffa883859a435ea3cf",
+              "url": "https://files.pythonhosted.org/packages/0e/dd/4f2b06b11bd0207899e03847b8b1d43d01d4f1383ae766cfb80876d7f52d/simplejson-3.18.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "47509775a5c41ec2a6cd17c9c00fc14965cad8e6670059663872ba5e39332f57",
+              "url": "https://files.pythonhosted.org/packages/12/84/952cf3559b7caa74571d80950f379923f0d2a79fdaadf3ef8fd0cf47a66d/simplejson-3.18.4-cp38-cp38-macosx_11_0_arm64.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "a8ac155e3fd3b54a63040df024e57e62c130b15a2fc66eff3c2a946f42beed52",
+              "url": "https://files.pythonhosted.org/packages/15/90/5635a50ca2831dc88c0bf3ad6d3af79f0ede694cd92f40cb4b84e01513b8/simplejson-3.18.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
+            },
+            {
+              "algorithm": "sha256",
+              "hash": "ab64f087c5863ac621b42e227e5a43bd9b28de581afe7be12ad96562b9be8203",
+              "url": "https://files.pythonhosted.org/packages/24/c1/42207c4fc7500e9137b45d8bd3872ab07c4c9b28b0de1cf473aa51319c74/simplejson-3.18.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "62628ea5df8c830d00a7417d5ecd949a1b24a8d0a5063a2a77f7ec7522110a0f",
-              "url": "https://files.pythonhosted.org/packages/2d/f5/09130a455aa70292fd4ad81834d2d16e8505d9bb2303041b84338f3b4a92/simplejson-3.18.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+              "hash": "b43d3c2e204d709af955bdb904ae127fe137363ace87fbf7dc8fe6017f7f8449",
+              "url": "https://files.pythonhosted.org/packages/2b/f7/db37baaa84199c62942c5912ef20e49663e5a6c0c554302f7ebda823ef82/simplejson-3.18.4-cp38-cp38-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "aad323e92cb1bd3b1db6f57c007dca964d13c52247ad844203ce381e94066601",
-              "url": "https://files.pythonhosted.org/packages/35/34/721bbb7ab1dd67f4611ddca7ed562ce761cb29553e731bfb231848963dd6/simplejson-3.18.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+              "hash": "706a7fc81ceeb321a1040d008b134056012188f95a5c31ad94fb03153b35cc84",
+              "url": "https://files.pythonhosted.org/packages/2f/b6/f495558e67bf3617c540312a78b80a01c83e63896569575191e4325ed160/simplejson-3.18.4-cp36-cp36m-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "3bab9ea49ff477c926c5787f79ec47cf51c7ffb15c9d8dd0f09e728807d44f4b",
-              "url": "https://files.pythonhosted.org/packages/36/4a/0d5b1a16cd6ebd618d4f6ba8458faa3acc9cee84429dabbe33a08c1866e0/simplejson-3.18.3-cp36-cp36m-macosx_10_9_x86_64.whl"
+              "hash": "f1b425a857ce52e651739314e4118fc68bd702ef983148b8fd5cb6f68bb6a020",
+              "url": "https://files.pythonhosted.org/packages/32/ee/fc40c82dc430a731194a9daecb807f811c2049ff02110cc7cd85e5db5bae/simplejson-3.18.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "44d6c52d4f5c0c087a6e88a92bf9f94234321d21be32c6471ba39856e304bbe3",
-              "url": "https://files.pythonhosted.org/packages/39/be/6f3ff9d9e7dade78ef6dbe4597ead07695ca6b388f6d9f46216f06adf6e9/simplejson-3.18.3-cp37-cp37m-musllinux_1_1_x86_64.whl"
+              "hash": "3dbfaa79b1c0efdb768392a19110f1aff793f3e8d43f57e292f46734b8affb45",
+              "url": "https://files.pythonhosted.org/packages/45/89/983d203dd5729cd40093dfc50f3769903025c3596ea5766c34fff198188d/simplejson-3.18.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "4de9fed1166aeedee44150fa83bc059aca6b612940281f8b5a39374781f16196",
-              "url": "https://files.pythonhosted.org/packages/46/2a/158d81cff8069b1d2f559cf6af32e9b96f4ed1372c956cdd43f92b702d72/simplejson-3.18.3-cp38-cp38-musllinux_1_1_x86_64.whl"
+              "hash": "682b202f56d9d9e1bb22eaca3e37321002223fd5ddef7189b9233e3c14079917",
+              "url": "https://files.pythonhosted.org/packages/4f/b2/f01e914eec868330dc747a83f1e5118044ff66504114de2061d026b4d63b/simplejson-3.18.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "2c7ee643ee93684bf76196e2d84a2090c6df8f01737a016e869b579593827b6e",
-              "url": "https://files.pythonhosted.org/packages/4a/01/483a50b105c08c116611459cd16388b764362ad852dbf2e86818e9fe08e6/simplejson-3.18.3-cp36-cp36m-musllinux_1_1_x86_64.whl"
+              "hash": "041dd69026284d10f035cefb4a75026d2cfcef31f31e62585eeb2b7776e7e047",
+              "url": "https://files.pythonhosted.org/packages/53/6e/971dad95ee1454bb0746b0981777894530a5e951b8582c41f155870bccdf/simplejson-3.18.4-cp38-cp38-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "290bbcdcbb37af3f7e43378f592ab7a9168fca640da6af63d42cdb535f96bbf2",
-              "url": "https://files.pythonhosted.org/packages/58/23/a0aed79acd3f8d20e66ed4307a3c31ffbacbea471976f31ca84ec8c5ef9c/simplejson-3.18.3-cp38-cp38-macosx_11_0_arm64.whl"
+              "hash": "efae49d0148ec68b6e012f1b9e19bd530f4dced378ba919e3e906ae2b829cc31",
+              "url": "https://files.pythonhosted.org/packages/72/83/5fc3fab2aca5bc6e72b3d53180a3ef9ba9894c5db30ace9c122f948c8776/simplejson-3.18.4-cp36-cp36m-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "7ff65b475091084e5bdb7f26e9c555956be7355b573ce494fa96f9f8e34541ac",
-              "url": "https://files.pythonhosted.org/packages/59/e4/05c9275dd886f7cdbe4fd2bbed99cb4cb1bccd62049f31850753e80a3994/simplejson-3.18.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+              "hash": "340b7d085b4a5063aacb8664b1250e4a7426c16e1cc80705c548a229153af147",
+              "url": "https://files.pythonhosted.org/packages/74/75/b4aee95666e641367fca570550816b906c0761236059ae74734e7884939a/simplejson-3.18.4-cp36-cp36m-musllinux_1_1_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "bcd9eac304a133ee4af58e68c5ded4c5ba663d3ee4602e8613359b776a1f8c8f",
-              "url": "https://files.pythonhosted.org/packages/6c/62/d37d25ce9a7f6791df4a317424f32f1a852a4f78b596bd6c29a057670335/simplejson-3.18.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+              "hash": "0cdb5069870f7d26a34e5adc30672d0a7b26e652720530a023bb3a8d8a42e37f",
+              "url": "https://files.pythonhosted.org/packages/8d/72/9d2ec69170c3ee7956bad0e7790f6cd9177e8493cb5c071c9a03bd7bf892/simplejson-3.18.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "6fe1173b4146641c872bafa6f9a21f3a2012f502d54fbb523a76e6320024fae9",
-              "url": "https://files.pythonhosted.org/packages/76/4e/050dac1990bea409797b992f67b2f0c6343be460f67cb78cc528f4636014/simplejson-3.18.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+              "hash": "5c4f59dd358c3a99efa46d62dc1583be3a1c37171f5240c4cbdc2d5838870902",
+              "url": "https://files.pythonhosted.org/packages/94/51/96fe3c72ea81fc821356403543139aeb4b5f45f95416eefd3b18d4082780/simplejson-3.18.4-cp38-cp38-macosx_10_9_universal2.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "f9f72d2b539512f382a48cc9ad6cea2d3a572e71e92c40e03d2140041eeaa233",
-              "url": "https://files.pythonhosted.org/packages/8c/83/e6545d5a091d5ac52847f1e33a628dbb2b3f71a90386ff772afbd5ebb40a/simplejson-3.18.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+              "hash": "ab5941e1fd509fc151258477ef4b663fe14c94f8faf3581827bf4b02080fd4ba",
+              "url": "https://files.pythonhosted.org/packages/96/fb/adfd19736ba058d2985c923d2e46a8492cc01e5de71681746ece299b9364/simplejson-3.18.4-cp38-cp38-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "52465a5578cfc2c5e374a574df14dfb75e04c6cb6a100b7abc8bf6c89bea8f5e",
-              "url": "https://files.pythonhosted.org/packages/93/fc/4e98915580cca6abfc8b5c256ceb72cb1a49d95354c67385f1fb329a2b98/simplejson-3.18.3-cp37-cp37m-macosx_10_9_x86_64.whl"
+              "hash": "16fbebfc38ad4285c256d2430797fd669b0437d090e985c6d443521d4303b133",
+              "url": "https://files.pythonhosted.org/packages/97/da/429126015bf7387ebde115845221a5f6f020a83075bd2e39bc121a4001d6/simplejson-3.18.4-cp38-cp38-musllinux_1_1_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "d990ea42ba908cb57a3df97d283aa26c1822f10a0a60e250b54ee21cd08c48d0",
-              "url": "https://files.pythonhosted.org/packages/96/32/6bdb89b660d683b2d7017754e4de9cc7a5bbe4e5cdecd6ba1df607c067fa/simplejson-3.18.3-cp36-cp36m-musllinux_1_1_i686.whl"
+              "hash": "a3bba99178f1b25878752a8bc6da2f93fbae754ebd4914d2ac4b869b9fb24102",
+              "url": "https://files.pythonhosted.org/packages/9c/9e/5bb167020a665f3934dc86eae8826dd0ac727340834a6639d75e68bfa1c4/simplejson-3.18.4-cp37-cp37m-macosx_10_9_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "16cc750d19852fa5ebafd55da86fa357f87991e07b4e2afb37a5975dfdde0153",
-              "url": "https://files.pythonhosted.org/packages/9d/6b/81b65d1885fb42a83016bc4a252afbd1017594049bdfdf6d8979ee663139/simplejson-3.18.3-cp38-cp38-macosx_10_9_x86_64.whl"
+              "hash": "827ddc3b3603f7d0421b054388da6face7871d800c4b3bbedeedc8778e4085ea",
+              "url": "https://files.pythonhosted.org/packages/b1/da/45d08e0def8f39af46f473512c3ac7ff1a882e9dbe4352be32f17cab681d/simplejson-3.18.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "9cf299fbb7d476676dfea372a3262654af98694bd1df35b060ce0fe1b68087f1",
-              "url": "https://files.pythonhosted.org/packages/a1/a3/c79418c5640d6745fffd0944d53b032b0f8326f4dfd097eb3ae53a29446f/simplejson-3.18.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+              "hash": "dc74a9ef4d61e18ee6f1886b6ef1fe285b1f432885288afacfb7402f7d469448",
+              "url": "https://files.pythonhosted.org/packages/c5/73/59eddc71ceefd5fc50e81cf5f2cd20758d76aba9da5240b5e1498be5f17a/simplejson-3.18.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "04a4b9a297cccbc9e1d66fe652fbffd55b36d6579c43132e821d315957302194",
-              "url": "https://files.pythonhosted.org/packages/a4/34/aa95e366c60011a85f16fa80b5786ae517126c126cc45e61f80b129d9fb7/simplejson-3.18.3-cp38-cp38-macosx_10_9_universal2.whl"
+              "hash": "a89d7fe994b115f0a792e6673f387af3db812a1760d594abad51e0ea11d3e470",
+              "url": "https://files.pythonhosted.org/packages/c6/4c/90232d5e5e3a7460f9453f94053ed901fb3a9bf0dcce2e3684d759436bd1/simplejson-3.18.4-cp36-cp36m-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "694332fd6fd10fe8868c2508583220d1a1a7be9ff049dab5bd6b9aedfb9edc50",
-              "url": "https://files.pythonhosted.org/packages/a8/23/c8b688d5baab19b3a2f8c571481063ce34d644317ed13349ebbf3ae84301/simplejson-3.18.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
+              "hash": "7339bd6203351555c1e728acd601ba95ebce0f6041ebdb386e025f00af3f1769",
+              "url": "https://files.pythonhosted.org/packages/c7/ef/15fb9e9e2d0b705b42f136b4ba01c96ba0e74a21303ec68a7c87910ab254/simplejson-3.18.4-cp37-cp37m-musllinux_1_1_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "cde5a3ff5e0bd5d6da676314dfae86c9e99bff77bca03d30223c9718a58f9e83",
-              "url": "https://files.pythonhosted.org/packages/a8/25/e79414bf0cf9f38dfa024ab2d873ace9e5202c9523bed62112e3e005e57a/simplejson-3.18.3-cp38-cp38-musllinux_1_1_aarch64.whl"
+              "hash": "e7d3f7cd57ce0c6a5bb8133f8ed5c3d1be0473a88b7d91a300626298f12d0999",
+              "url": "https://files.pythonhosted.org/packages/cc/3a/e05810fb58a934437aaead11a4b4b95ff5038ea8411ef890a4148b59c195/simplejson-3.18.4-cp38-cp38-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "ebb53837c5ffcb6100646018565d3f1afed6f4b185b14b2c9cbccf874fe40157",
-              "url": "https://files.pythonhosted.org/packages/b1/86/a67f6f595c5da14fa80bb4a8f7084c391ac1bfd3208ea4906307afc2b181/simplejson-3.18.3.tar.gz"
+              "hash": "b482d1fdd8f860e743c7de8cd6dfe54fb9fe8cd6ccba29e2966912ac89e17b2f",
+              "url": "https://files.pythonhosted.org/packages/d6/a1/307bf6afd3ee40266fb8f58a3f066f78fb27129d4306ecba8568c4497f0f/simplejson-3.18.4-cp37-cp37m-musllinux_1_1_x86_64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "502d86fbfe914263642479b87ed61af3b27b9e039df77acd2416cfccfc892e68",
-              "url": "https://files.pythonhosted.org/packages/b1/cf/1e9e758bc56ec51d5278924a3fc8fb3542c040021cca8cfd2054556eea59/simplejson-3.18.3-cp37-cp37m-musllinux_1_1_i686.whl"
+              "hash": "7f27a079cb009ba569983061a50a9270b7e1d35f81e4eeaf0e26f8924027e550",
+              "url": "https://files.pythonhosted.org/packages/d9/ff/f190f20ed812b5af8734422b9d9ca34f2b6468f5894b3ef9cfef312f9cf3/simplejson-3.18.4-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "23fce984045804194f513a2739dcd82be350198470d5ade5058da019a48cf3f8",
-              "url": "https://files.pythonhosted.org/packages/b8/76/c7782c9c1c3a34a9543085716eab49d9fc013c381dffbc62d450dc5d09d3/simplejson-3.18.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
+              "hash": "b9893852c559998f667e6434d2c2474518d4cdfd1b9cec8e57b3c9d577ba55c1",
+              "url": "https://files.pythonhosted.org/packages/e1/22/c483a14ae63bb3fbf4e960bb462134342c9d35fc41817c69f2f6bc8c2a3f/simplejson-3.18.4-cp36-cp36m-musllinux_1_1_i686.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "7c26fe63755ecc59c502ddde8e58ce8b765bf4fdd3f5858d2b7c8ab28bc2a9c8",
-              "url": "https://files.pythonhosted.org/packages/de/fc/500e7f56e61d5f5c1345a61f0e4b909e2d4f6099ae17a03bef5f6fbc78ba/simplejson-3.18.3-cp37-cp37m-musllinux_1_1_aarch64.whl"
+              "hash": "d5f67bffa6fc68e391b2250e1feb43d534ded64a7b918eb89cf7e3e679759d94",
+              "url": "https://files.pythonhosted.org/packages/e7/76/6d2abafcb226be9a5c7027534be626361d6ac4d4c5dd0783d4197d126ba7/simplejson-3.18.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "2b0f6de11f5ce4b80f51bc49d08b898602e190547f8efe4e44af8ae3cda7779d",
-              "url": "https://files.pythonhosted.org/packages/ff/ed/f3c4d1366ed90831b116fabcd585cca61fbe453509eac8b6c7b8614ec04b/simplejson-3.18.3-cp36-cp36m-musllinux_1_1_aarch64.whl"
+              "hash": "56d36f47bc7c7684504f0f18feb161a0b1162546b3622e45aa6155f8285180ac",
+              "url": "https://files.pythonhosted.org/packages/f2/43/4c570e97211107b31a50516967318b3a7654e42c9f96eded63e9cfb3a8a3/simplejson-3.18.4-cp37-cp37m-musllinux_1_1_ppc64le.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "099bbd3b5b4ea83159a980348cd481a34984dee5fe1b9fac31a9137158f46960",
-              "url": "https://files.pythonhosted.org/packages/ff/f4/a80eac6143479dfb335571e64d0a006aa6939421bbfb268bc612dde0efc8/simplejson-3.18.3-cp38-cp38-musllinux_1_1_i686.whl"
+              "hash": "deb71e6166e4f1264174d78b5b88abd52b14c6649e6eabaf9cf93cb1c7362850",
+              "url": "https://files.pythonhosted.org/packages/f7/62/be32e0ca97bb049e3a7a9ecb8dca1211756cd88373987a7ff0773297fe9c/simplejson-3.18.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
             }
           ],
           "project_name": "simplejson",
           "requires_dists": [],
           "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,>=2.5",
-          "version": "3.18.3"
+          "version": "3.18.4"
         },
         {
           "artifacts": [
@@ -3960,7 +3990,7 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "e4dcad435c0184ede0372b8a2f067212cb22b3c26341720a6ac9c85097346715",
+              "hash": "bd5d4cd424bdd671d4c221395a145b219083d6e6a97e25a19dd8b3bea1088cbf",
               "url": "git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master"
             }
           ],
@@ -3969,13 +3999,13 @@
             "passlib<1.8.0,>=1.7.1"
           ],
           "requires_python": null,
-          "version": "0.1.1"
+          "version": "0.2.0"
         },
         {
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "31c5c39cc1fbc0e8ee643a6298d898b52db97baec93f70b8a284ff06ff547f56",
+              "hash": "c521a3dfc6948a6a57da4dcaa48e0b3390fadcf00d36e3948510cd1c32a10d96",
               "url": "git+https://github.com/StackStorm/st2-auth-ldap.git@master"
             }
           ],
@@ -3991,7 +4021,7 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "3b40f91ab4d13271cb1049423b54f103710ded6c8469cac3e39c63ad8b3ece09",
+              "hash": "9141e9e388ab036f9c6ecc055666e900de86f0e30ac818ca37af86d8cb6fb309",
               "url": "git+https://github.com/StackStorm/st2-rbac-backend.git@master"
             }
           ],
@@ -4387,13 +4417,13 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1",
-              "url": "https://files.pythonhosted.org/packages/fe/ca/466766e20b767ddb9b951202542310cba37ea5f2d792dae7589f1741af58/urllib3-1.26.14-py2.py3-none-any.whl"
+              "hash": "aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42",
+              "url": "https://files.pythonhosted.org/packages/7b/f5/890a0baca17a61c1f92f72b81d3c31523c99bec609e60c292ea55b387ae8/urllib3-1.26.15-py2.py3-none-any.whl"
             },
             {
               "algorithm": "sha256",
-              "hash": "076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72",
-              "url": "https://files.pythonhosted.org/packages/c5/52/fe421fb7364aa738b3506a2d99e4f3a56e079c0a798e9f4fa5e14c60922f/urllib3-1.26.14.tar.gz"
+              "hash": "8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305",
+              "url": "https://files.pythonhosted.org/packages/21/79/6372d8c0d0641b4072889f3ff84f279b738cd8595b64c8e0496d4e848122/urllib3-1.26.15.tar.gz"
             }
           ],
           "project_name": "urllib3",
@@ -4410,7 +4440,7 @@
             "urllib3-secure-extra; extra == \"secure\""
           ],
           "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7",
-          "version": "1.26.14"
+          "version": "1.26.15"
         },
         {
           "artifacts": [
@@ -4958,7 +4988,7 @@
     }
   ],
   "path_mappings": {},
-  "pex_version": "2.1.111",
+  "pex_version": "2.1.126",
   "pip_version": "20.3.4-patched",
   "prefer_older_binary": false,
   "requirements": [
diff --git a/pants-plugins/macros.py b/pants-plugins/macros.py
index b7d2367022..9650ab3892 100644
--- a/pants-plugins/macros.py
+++ b/pants-plugins/macros.py
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 
-# this is only here temporarily until we update to pants 2.16+
-def stevedore_namespace(ns):
-    return ns
-
-
 def st2_publish_repos():
     """Return the list of repos twine should publish to.
 
@@ -29,9 +24,7 @@ def st2_publish_repos():
 
     Credentials for pypi should be in ~/.pypirc or in TWINE_* env vars.
     """
-    # TODO: switch from hard-coded to env() once we upgrade to pants 2.16
-    # return [env("ST2_PUBLISH_REPO", "@pypi")]  # noqa: F821
-    return ["@pypi"]
+    return [env("ST2_PUBLISH_REPO", "@pypi")]  # noqa: F821
 
 
 def st2_license(**kwargs):
diff --git a/pants.toml b/pants.toml
index 2c40fd7ca1..1a9ce37c68 100644
--- a/pants.toml
+++ b/pants.toml
@@ -6,13 +6,14 @@ enabled = false
 repo_id = "de0dea7a-9f6a-4c6e-aa20-6ba5ad969b8a"
 
 [GLOBAL]
-pants_version = "2.15.0"
+pants_version = "2.16.0a0"
 pythonpath = ["%(buildroot)s/pants-plugins"]
 build_file_prelude_globs = ["pants-plugins/macros.py"]
 backend_packages = [
   # python
   "pants.backend.python",
   "pants.backend.experimental.python", # activates twine `publish` support
+  "pants.backend.experimental.python.framework.stevedore",
   "pants.backend.python.mixed_interpreter_constraints",
   "pants.backend.python.lint.bandit",
   "pants.backend.python.lint.black",
@@ -130,14 +131,26 @@ pants-plugins = [
 st2 = "lockfiles/st2-constraints.txt"
 
 [python-infer]
+# https://www.pantsbuild.org/docs/reference-python-infer#string_imports
+# https://www.pantsbuild.org/docs/reference-python-infer#string_imports_min_dots
+# Infer a target's dependencies based on strings that look like dynamic deps with >=1 dots.
+# To debug the imports and see if a string is used in dep inference or if it is ignored, use:
+#   ./pants python-dump-source-analysis --analysis-flavor=raw_dependency_inference <path(s) to file(s)> | jq '.[].resolved'
+string_imports = true
+string_imports_min_dots = 1
 # https://www.pantsbuild.org/docs/reference-python-infer#unowned_dependency_behavior
 # The default changed from "ignore" to "warning" in pants 2.14.
-# Many of the new warnings however have been adressed via explicit deps,
-# so the warnings are not helpful. In pants 2.16, a "visibility" feature might help
-# us to disambiguate deps between files without those explicit BUILD dependencies,
-# and without adding "# pants: no-infer-dep" comments all over the codebase.
-# Revisit this in pants 2.16 to see if it is feasible to use the default "warning".
+# The ambiguity_resolution setting/feature (below) added in 2.16 resolves most of
+# our ambiguous dependency inference issues, which allowed us to remove the explicit
+# deps in various BUILD files. But, there is not a good way to tell pants about our
+# custom PYTHONPATH for packs, so actions that import other actions are still showing
+# up as unowned. Maybe we can extend pants-plugins/pack_metadata so we can use "warn".
 unowned_dependency_behavior = "ignore"
+# https://www.pantsbuild.org/v2.16/docs/reference-python-infer#ambiguity_resolution
+# When resolving ambiguous deps prefer one that is in the same source root as the
+# file that uses it. So, without manually disambiguating the dep in the BUILD file,
+# importing tests.unit.base in st2common/tests/unit will get a dep on st2common/tests/unit/base.py
+ambiguity_resolution = "by_source_root"
 
 [setup-py-generation]
 # when building the package (with ./pants package ::), pants will,
@@ -176,6 +189,9 @@ extra_requirements = [
 ]
 config = "lint-configs/python/.flake8"
 
+[generate-lockfiles]
+diff = true
+
 [pylint]
 lockfile = "lockfiles/pylint.lock"
 version = "pylint~=2.8.2"
diff --git a/st2auth/st2auth/backends/__init__.py b/st2auth/st2auth/backends/__init__.py
index a626f0d082..61611360b3 100644
--- a/st2auth/st2auth/backends/__init__.py
+++ b/st2auth/st2auth/backends/__init__.py
@@ -26,7 +26,7 @@
 
 LOG = logging.getLogger(__name__)
 
-BACKENDS_NAMESPACE = "st2auth.backends.backend"
+BACKENDS_NAMESPACE = "st2auth.backends.backend"  # pants: no-infer-dep
 
 
 def get_available_backends():
diff --git a/st2auth/st2auth/sso/__init__.py b/st2auth/st2auth/sso/__init__.py
index b6d0df930a..a33f791f04 100644
--- a/st2auth/st2auth/sso/__init__.py
+++ b/st2auth/st2auth/sso/__init__.py
@@ -29,7 +29,7 @@
 
 LOG = logging.getLogger(__name__)
 
-BACKENDS_NAMESPACE = "st2auth.sso.backends"
+BACKENDS_NAMESPACE = "st2auth.sso.backends"  # pants: no-infer-dep
 
 
 def get_available_backends():
diff --git a/st2auth/tests/unit/BUILD b/st2auth/tests/unit/BUILD
index 8b7799ccf8..f4100df4b4 100644
--- a/st2auth/tests/unit/BUILD
+++ b/st2auth/tests/unit/BUILD
@@ -5,8 +5,4 @@ __defaults__(
 
 python_tests(
     name="tests",
-    dependencies=[
-        # most files import tests.base which is ambiguous. Tell pants which one to use.
-        "st2auth/tests/base.py",
-    ],
 )
diff --git a/st2auth/tests/unit/controllers/v1/BUILD b/st2auth/tests/unit/controllers/v1/BUILD
index bd52dfb436..57341b1358 100644
--- a/st2auth/tests/unit/controllers/v1/BUILD
+++ b/st2auth/tests/unit/controllers/v1/BUILD
@@ -1,7 +1,3 @@
 python_tests(
     name="tests",
-    dependencies=[
-        # most files import tests.base which is ambiguous. Tell pants which one to use.
-        "st2auth/tests/base.py",
-    ],
 )
diff --git a/st2client/tests/unit/BUILD b/st2client/tests/unit/BUILD
index fc8d04408d..443cba2f69 100644
--- a/st2client/tests/unit/BUILD
+++ b/st2client/tests/unit/BUILD
@@ -7,7 +7,5 @@ python_tests(
     name="tests",
     dependencies=[
         "st2client/tests/fixtures:st2client_ini",
-        # most files import tests.base which is ambiguous. Tell pants which one to use.
-        "st2client/tests/base.py",
     ],
 )
diff --git a/st2common/st2common/constants/runners.py b/st2common/st2common/constants/runners.py
index 52ec738384..13f0cdf976 100644
--- a/st2common/st2common/constants/runners.py
+++ b/st2common/st2common/constants/runners.py
@@ -78,4 +78,4 @@
 ]
 
 # Namespaces for dynamically loaded runner modules
-RUNNERS_NAMESPACE = "st2common.runners.runner"
+RUNNERS_NAMESPACE = "st2common.runners.runner"  # pants: no-infer-dep
diff --git a/st2common/st2common/metrics/base.py b/st2common/st2common/metrics/base.py
index 215780b86f..2ef8af16f9 100644
--- a/st2common/st2common/metrics/base.py
+++ b/st2common/st2common/metrics/base.py
@@ -43,7 +43,7 @@
 
 LOG = logging.getLogger(__name__)
 
-PLUGIN_NAMESPACE = "st2common.metrics.driver"
+PLUGIN_NAMESPACE = "st2common.metrics.driver"  # pants: no-infer-dep
 
 # Stores reference to the metrics driver class instance.
 # NOTE: This value is populated lazily on the first get_driver() function call
diff --git a/st2common/st2common/rbac/backends/__init__.py b/st2common/st2common/rbac/backends/__init__.py
index bb7ad3d58f..fbd47542d2 100644
--- a/st2common/st2common/rbac/backends/__init__.py
+++ b/st2common/st2common/rbac/backends/__init__.py
@@ -26,7 +26,7 @@
 
 LOG = logging.getLogger(__name__)
 
-BACKENDS_NAMESPACE = "st2common.rbac.backend"
+BACKENDS_NAMESPACE = "st2common.rbac.backend"  # pants: no-infer-dep
 
 # Cache which maps backed name -> backend class instance
 # NOTE: We use cache to avoid slow stevedore dynamic filesystem instrospection on every
diff --git a/st2common/st2common/runners/__init__.py b/st2common/st2common/runners/__init__.py
index d6468f78e2..15fc6bb3b0 100644
--- a/st2common/st2common/runners/__init__.py
+++ b/st2common/st2common/runners/__init__.py
@@ -21,7 +21,7 @@
 
 __all__ = ["BACKENDS_NAMESPACE", "get_available_backends", "get_backend_driver"]
 
-BACKENDS_NAMESPACE = "st2common.runners.runner"
+BACKENDS_NAMESPACE = "st2common.runners.runner"  # pants: no-infer-dep
 
 
 def get_available_backends():
diff --git a/st2common/st2common/util/driver_loader.py b/st2common/st2common/util/driver_loader.py
index 50f5044c41..99e84ac757 100644
--- a/st2common/st2common/util/driver_loader.py
+++ b/st2common/st2common/util/driver_loader.py
@@ -25,7 +25,7 @@
 
 LOG = logging.getLogger(__name__)
 
-BACKENDS_NAMESPACE = "st2common.rbac.backend"
+BACKENDS_NAMESPACE = "st2common.rbac.backend"  # pants: no-infer-dep
 
 
 def get_available_backends(namespace, invoke_on_load=False):
diff --git a/st2common/tests/integration/BUILD b/st2common/tests/integration/BUILD
index 9daca7bc7b..d97e41ba99 100644
--- a/st2common/tests/integration/BUILD
+++ b/st2common/tests/integration/BUILD
@@ -10,6 +10,12 @@ python_tests(
         "conf/st2.tests.conf:st2_tests_conf",
         "conf/st2.tests1.conf:st2_tests_conf",
     ],
+    stevedore_namespaces=[
+        "orquesta.expressions.functions",
+        "st2common.runners.runner",
+        "st2common.rbac.backend",
+        "st2common.metrics.driver",
+    ],
 )
 
 python_test_utils(
diff --git a/st2common/tests/unit/BUILD b/st2common/tests/unit/BUILD
index 097775214f..46abc56365 100644
--- a/st2common/tests/unit/BUILD
+++ b/st2common/tests/unit/BUILD
@@ -5,9 +5,11 @@ __defaults__(
 
 python_tests(
     name="tests",
-    dependencies=[
-        # several files import tests.unit.base which is ambiguous. Tell pants which one to use.
-        "st2common/tests/unit/base.py",
+    stevedore_namespaces=[
+        "orquesta.expressions.functions",
+        "st2common.runners.runner",
+        "st2common.rbac.backend",
+        "st2common.metrics.driver",
     ],
     uses=["mongo", "rabbitmq"],
     overrides={
diff --git a/st2common/tests/unit/migrations/BUILD b/st2common/tests/unit/migrations/BUILD
index 57341b1358..2134771495 100644
--- a/st2common/tests/unit/migrations/BUILD
+++ b/st2common/tests/unit/migrations/BUILD
@@ -1,3 +1,10 @@
 python_tests(
     name="tests",
+    overrides={
+        "test_v35_migrate_db_dict_field_values.py": dict(
+            dependencies=[
+                "st2common/bin/migrations/v3.5/st2_migrate_db_dict_field_values.py",
+            ],
+        ),
+    },
 )
diff --git a/st2common/tests/unit/services/BUILD b/st2common/tests/unit/services/BUILD
index b1759d9d2e..a30ca92a77 100644
--- a/st2common/tests/unit/services/BUILD
+++ b/st2common/tests/unit/services/BUILD
@@ -1,4 +1,10 @@
 python_tests(
     name="tests",
+    stevedore_namespaces=[
+        "orquesta.expressions.functions",
+        "st2common.runners.runner",
+        "st2common.rbac.backend",
+        "st2common.metrics.driver",
+    ],
     uses=["mongo", "rabbitmq"],
 )
diff --git a/st2common/tests/unit/test_action_db_utils.py b/st2common/tests/unit/test_action_db_utils.py
index 7ace386c07..dd08c489b2 100644
--- a/st2common/tests/unit/test_action_db_utils.py
+++ b/st2common/tests/unit/test_action_db_utils.py
@@ -532,7 +532,7 @@ def setup_runner(cls):
                     "default": "runnerdummy",
                 },
             },
-            "runner_module": "tests.test_runner",
+            "runner_module": "tests.test_runner",  # pants: no-infer-dep
         }
         runnertype_api = RunnerTypeAPI(**test_runner)
         ActionDBUtilsTestCase.runnertype_db = RunnerType.add_or_update(
diff --git a/tools/BUILD b/tools/BUILD
index 1f49b8476c..0270ed5b21 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -16,20 +16,10 @@ python_sources(
             "dependencies": [
                 # the auth backends get listed in the conf file
                 "//:auth_backends",
-                # the following should match CONFIGS in config_gen.py
+                # We are using string import detection to gather the imports
+                # from CONFIGS in config_gen.py. The following command is
+                # helpful in validating that dependencies include everything:
                 # grep -rl '^def register_opts(ignore_errors=False):' st2*
-                "st2actions/st2actions/scheduler/config.py",
-                "st2actions/st2actions/workflows/config.py",
-                "st2actions/st2actions/notifier/config.py",
-                "st2actions/st2actions/config.py",
-                "st2api/st2api/config.py",
-                "st2auth/st2auth/config.py",
-                "st2common/st2common/config.py",
-                "st2reactor/st2reactor/garbage_collector/config.py",
-                "st2reactor/st2reactor/timer/config.py",
-                "st2reactor/st2reactor/sensor/config.py",
-                "st2reactor/st2reactor/rules/config.py",
-                "st2stream/st2stream/config.py",
             ]
         },
     },
diff --git a/tools/config_gen.py b/tools/config_gen.py
index 92d1093eab..a0343a9465 100755
--- a/tools/config_gen.py
+++ b/tools/config_gen.py
@@ -25,10 +25,9 @@
 
 
 CONFIGS = [
-    # this is duplicated in tools/BUILD
-    # TODO: replace this with a heuristic that searches for config.py
-    #       maybe with an exclude list (eg st2tests.config st2client)
-    #       grep -rl 'def register_opts(ignore_errors=False):' st2*
+    # pants uses these strings to infer dependencies. Compare this list
+    # with the output of this command to make sure everything is present:
+    #   grep -rl 'def register_opts(ignore_errors=False):' st2*
     "st2actions.config",
     "st2actions.scheduler.config",
     "st2actions.notifier.config",