From 4a848051f6bf1688da42ff0ad8589fa5c6216a55 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 10:06:03 -0500 Subject: [PATCH 01/13] use st2-auth-backend-flatfile release from pypi --- requirements-pants.txt | 2 +- requirements.txt | 2 +- st2auth/in-requirements.txt | 2 +- st2auth/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements-pants.txt b/requirements-pants.txt index 88cf4baaa7..d1f98e7331 100644 --- a/requirements-pants.txt +++ b/requirements-pants.txt @@ -76,7 +76,7 @@ six sseclient-py stevedore # For backward compatibility reasons, flat file backend is installed by default -st2-auth-backend-flat-file @ git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master +st2-auth-backend-flat-file st2-auth-ldap @ git+https://github.com/StackStorm/st2-auth-ldap.git@master st2-rbac-backend @ git+https://github.com/StackStorm/st2-rbac-backend.git@master # tabulate used by tools/log_watcher.py diff --git a/requirements.txt b/requirements.txt index 754f55fa7e..6fa213b3a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -68,7 +68,7 @@ semver==3.0.2 simplejson six==1.16.0 sseclient-py==1.8.0 -st2-auth-backend-flat-file@ git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master +st2-auth-backend-flat-file st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master stevedore==5.3.0 diff --git a/st2auth/in-requirements.txt b/st2auth/in-requirements.txt index 0d9e5e01a3..9192f5890c 100644 --- a/st2auth/in-requirements.txt +++ b/st2auth/in-requirements.txt @@ -7,6 +7,6 @@ pymongo six stevedore # For backward compatibility reasons, flat file backend is installed by default -st2-auth-backend-flat-file@ git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master +st2-auth-backend-flat-file st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master gunicorn diff --git a/st2auth/requirements.txt b/st2auth/requirements.txt index 15fe0915f7..18b5601ce3 100644 --- a/st2auth/requirements.txt +++ b/st2auth/requirements.txt @@ -12,6 +12,6 @@ oslo.config==9.6.0 passlib==1.7.4 pymongo==4.6.3 six==1.16.0 -st2-auth-backend-flat-file@ git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master +st2-auth-backend-flat-file st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master stevedore==5.3.0 From 0b73a006290536326bec67d83a5c7b5e006f160f Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 10:07:13 -0500 Subject: [PATCH 02/13] regenerate lockfiles/st2.lock Lockfile diff: lockfiles/st2.lock [st2] == Upgraded dependencies == orjson 3.10.7 --> 3.10.10 st2-auth-backend-flat-file 0.2.0 --> 0.3.0 webob 1.8.8 --> 1.8.9 Also bumps locked commit for st2-auth-ldap --- fixed-requirements.txt | 4 +- lockfiles/st2.lock | 102 ++++++++++++++++++++----------------- requirements.txt | 4 +- st2client/requirements.txt | 2 +- st2common/requirements.txt | 4 +- 5 files changed, 61 insertions(+), 55 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index bd59994ef9..55eed71679 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -70,7 +70,7 @@ tooz==6.3.0 # virtualenv==20.26.5 (<21) has pip==24.2 wheel==0.44.0 setuptools==75.2.0 # lockfiles/st2.lock has pip==24.2 wheel==0.44.0 setuptools==75.2.0 virtualenv==20.27.0 -webob==1.8.8 +webob==1.8.9 zake==0.2.2 # test requirements below bcrypt==4.2.0 @@ -81,5 +81,5 @@ nose-parallel==0.4.0 psutil==6.1.0 python-dateutil==2.9.0.post0 python-statsd==2.1.0 -orjson==3.10.7 +orjson==3.10.10 zipp==3.20.2 diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock index 5b222e05da..ece95eaf63 100644 --- a/lockfiles/st2.lock +++ b/lockfiles/st2.lock @@ -70,7 +70,7 @@ // "simplejson", // "six", // "sseclient-py", -// "st2-auth-backend-flat-file@ git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master", +// "st2-auth-backend-flat-file", // "st2-auth-ldap@ git+https://github.com/StackStorm/st2-auth-ldap.git@master", // "st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master", // "stevedore", @@ -2312,94 +2312,94 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "0fa5886854673222618638c6df7718ea7fe2f3f2384c452c9ccedc70b4a510a5", - "url": "https://files.pythonhosted.org/packages/d7/15/2c1ca80d4e37780514cc369004fce77e2748b54857b62eb217e9a243a669/orjson-3.10.7-cp39-cp39-musllinux_1_2_x86_64.whl" + "hash": "1dcbb0ca5fafb2b378b2c74419480ab2486326974826bbf6588f4dc62137570a", + "url": "https://files.pythonhosted.org/packages/5e/5a/8c4b509288240f72f8a4a28bf0cc3f9df780c749a4ec57a588769bd0e8b9/orjson-3.10.10-cp39-cp39-musllinux_1_2_x86_64.whl" }, { "algorithm": "sha256", - "hash": "5b24a579123fa884f3a3caadaed7b75eb5715ee2b17ab5c66ac97d29b18fe57f", - "url": "https://files.pythonhosted.org/packages/04/02/bcb6ee82ecb5bc8f7487bce2204db9e9d8818f5fe7a3cad1625254f8d3a7/orjson-3.10.7-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl" + "hash": "e2277ec2cea3775640dc81ab5195bb5b2ada2fe0ea6eee4677474edc75ea6785", + "url": "https://files.pythonhosted.org/packages/12/e4/fa329b75b182cea5601a8b1a4ba086ce64ae4ce1b8bb27a56e38810de8d7/orjson-3.10.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl" }, { "algorithm": "sha256", - "hash": "c31008598424dfbe52ce8c5b47e0752dca918a4fdc4a2a32004efd9fab41d866", - "url": "https://files.pythonhosted.org/packages/06/47/90ff5f8522d371b8ec117791db13a14880647cad22a6d3c4369026ec0f48/orjson-3.10.7-cp38-cp38-musllinux_1_2_x86_64.whl" + "hash": "672f9874a8a8fb9bb1b771331d31ba27f57702c8106cdbadad8bda5d10bc1019", + "url": "https://files.pythonhosted.org/packages/54/d0/ff81ce26587459368a58ed772ce131938458c421b77fd0e74b1b11988f1e/orjson-3.10.10-cp39-cp39-musllinux_1_2_aarch64.whl" }, { "algorithm": "sha256", - "hash": "e76be12658a6fa376fcd331b1ea4e58f5a06fd0220653450f0d415b8fd0fbe20", - "url": "https://files.pythonhosted.org/packages/08/8c/23813894241f920e37ae363aa59a6a0fdb06e90afd60ad89e5a424113d1c/orjson-3.10.7-cp39-cp39-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl" + "hash": "7948cfb909353fce2135dcdbe4521a5e7e1159484e0bb024c1722f272488f2b8", + "url": "https://files.pythonhosted.org/packages/70/e1/47fa8d4745eb6d641b143c915ec1da9ea161c41783e00429f3d8bd41448c/orjson-3.10.10-cp38-cp38-musllinux_1_2_x86_64.whl" }, { "algorithm": "sha256", - "hash": "1193b2416cbad1a769f868b1749535d5da47626ac29445803dae7cc64b3f5c98", - "url": "https://files.pythonhosted.org/packages/25/13/a66f4873ed57832aab57dd8b49c91c4c22b35fb1fa0d1dce3bf8928f2fe0/orjson-3.10.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "5a059afddbaa6dd733b5a2d76a90dbc8af790b993b1b5cb97a1176ca713b5df8", + "url": "https://files.pythonhosted.org/packages/7b/3c/04294098b67d1cd93d56e23cee874fac4a8379943c5e556b7a922775e672/orjson-3.10.10-cp39-cp39-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl" }, { "algorithm": "sha256", - "hash": "4829cf2195838e3f93b70fd3b4292156fc5e097aac3739859ac0dcc722b27ac0", - "url": "https://files.pythonhosted.org/packages/57/1c/6d195253a25fdc9770056e3fed96d2e1105b2108c2e7f05bb2178f2e89cb/orjson-3.10.7-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl" + "hash": "37949383c4df7b4337ce82ee35b6d7471e55195efa7dcb45ab8226ceadb0fe3b", + "url": "https://files.pythonhosted.org/packages/80/44/d36e86b33fc84f224b5f2cdf525adf3b8f9f475753e721c402b1ddef731e/orjson-3.10.10.tar.gz" }, { "algorithm": "sha256", - "hash": "e72591bcfe7512353bd609875ab38050efe3d55e18934e2f18950c108334b4ff", - "url": "https://files.pythonhosted.org/packages/6c/c1/97b5bb1869572483b0e060264180fe5417a836ed46c09166f0dc6bb1d42d/orjson-3.10.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "0c25908eb86968613216f3db4d3003f1c45d78eb9046b71056ca327ff92bdbd4", + "url": "https://files.pythonhosted.org/packages/89/2f/5ddd09e893b07a82aa4b9be810332c3f5efaafa0e4ad5648f730e3e87c71/orjson-3.10.10-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl" }, { "algorithm": "sha256", - "hash": "6ea2b2258eff652c82652d5e0f02bd5e0463a6a52abb78e49ac288827aaa1469", - "url": "https://files.pythonhosted.org/packages/6e/54/cf4838db05cc5c3e2ccd8b85e80239789457fc8a20071910e8f97cd7fa44/orjson-3.10.7-cp38-cp38-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl" + "hash": "dddd5516bcc93e723d029c1633ae79c4417477b4f57dad9bfeeb6bc0315e654a", + "url": "https://files.pythonhosted.org/packages/90/c6/52ce917ea468ef564ec100e3f2164e548e61b4c71140c3e058a913bfea9b/orjson-3.10.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl" }, { "algorithm": "sha256", - "hash": "084e537806b458911137f76097e53ce7bf5806dda33ddf6aaa66a028f8d43a23", - "url": "https://files.pythonhosted.org/packages/84/87/272c9abc2c45f535f5b7d05219d94e3962a8cb2866a72a4778289358a873/orjson-3.10.7-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" + "hash": "829700cc18503efc0cf502d630f612884258020d98a317679cd2054af0259568", + "url": "https://files.pythonhosted.org/packages/93/7d/3ef9524d57343f0642be8f101296a4bccdf836bd0730654e066ecf88b2bc/orjson-3.10.10-cp38-cp38-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl" }, { "algorithm": "sha256", - "hash": "75ef0640403f945f3a1f9f6400686560dbfb0fb5b16589ad62cd477043c4eee3", - "url": "https://files.pythonhosted.org/packages/9e/03/821c8197d0515e46ea19439f5c5d5fd9a9889f76800613cfac947b5d7845/orjson-3.10.7.tar.gz" + "hash": "d5ef198bafdef4aa9d49a4165ba53ffdc0a9e1c7b6f76178572ab33118afea25", + "url": "https://files.pythonhosted.org/packages/95/52/d4fc57145446c7d0cbf5cfdaceb0ea4d5f0636e7398de02e3abc3bf91341/orjson-3.10.10-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl" }, { "algorithm": "sha256", - "hash": "144888c76f8520e39bfa121b31fd637e18d4cc2f115727865fdf9fa325b10412", - "url": "https://files.pythonhosted.org/packages/a3/4a/a041b6c95f623c28ccab87ce0720ac60cd0734f357774fd7212ff1fd9077/orjson-3.10.7-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl" + "hash": "848ea3b55ab5ccc9d7bbd420d69432628b691fba3ca8ae3148c35156cbd282aa", + "url": "https://files.pythonhosted.org/packages/cc/98/780c29851b4a1e7942087cc3b7beb0d40a985f96cffae03889c75307300b/orjson-3.10.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "ed350d6978d28b92939bfeb1a0570c523f6170efc3f0a0ef1f1df287cd4f4960", - "url": "https://files.pythonhosted.org/packages/b8/e5/f3cb8f766e7f5e5197e884d63fba320aa4f32a04a21b68864c71997cb17e/orjson-3.10.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "hash": "218cb0bc03340144b6328a9ff78f0932e642199ac184dd74b01ad691f42f93ff", + "url": "https://files.pythonhosted.org/packages/cd/2c/6bb8878e31ffe1ea6ff60e0250ccd326b5cf0d13ffe237f1cdfc525b95f2/orjson-3.10.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" }, { "algorithm": "sha256", - "hash": "09b2d92fd95ad2402188cf51573acde57eb269eddabaa60f69ea0d733e789fe9", - "url": "https://files.pythonhosted.org/packages/ba/5b/89f2d5cda6c7bcad2067a87407aa492392942118969d548bc77ab4e9c818/orjson-3.10.7-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" + "hash": "aaf29ce0bb5d3320824ec3d1508652421000ba466abd63bdd52c64bcce9eb1fa", + "url": "https://files.pythonhosted.org/packages/cf/75/9b081915f083a10832f276d24babee910029ea42368486db9a81741b8dba/orjson-3.10.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" }, { "algorithm": "sha256", - "hash": "f4db56635b58cd1a200b0a23744ff44206ee6aa428185e2b6c4a65b3197abdcd", - "url": "https://files.pythonhosted.org/packages/c1/c6/5d5c556720f8a31c5618db7326f6de6c07ddfea72497c1baa69fca24e1ad/orjson-3.10.7-cp39-cp39-musllinux_1_2_aarch64.whl" + "hash": "6f9b5c59f7e2a1a410f971c5ebc68f1995822837cd10905ee255f96074537ee6", + "url": "https://files.pythonhosted.org/packages/da/91/f021aa2eed9919f89ae2e4507e851fbbc8c5faef3fa79984549f415c7fa9/orjson-3.10.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" }, { "algorithm": "sha256", - "hash": "4e6c3da13e5a57e4b3dca2de059f243ebec705857522f188f0180ae88badd354", - "url": "https://files.pythonhosted.org/packages/cb/dd/f5b385ab593974efd082986f8c6f4f6d07715f7321d908ca16bc4ecd70cd/orjson-3.10.7-cp38-cp38-musllinux_1_2_aarch64.whl" + "hash": "a12f2003695b10817f0fa8b8fca982ed7f5761dcb0d93cff4f2f9f6709903fd7", + "url": "https://files.pythonhosted.org/packages/dc/40/139fc90e69a8200e8d971c4dd0495ed2c7de6d8d9f70254d3324cb9be026/orjson-3.10.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "430ee4d85841e1483d487e7b81401785a5dfd69db5de01314538f31f8fbf7ee1", - "url": "https://files.pythonhosted.org/packages/e0/22/218233b8038a83ca8df0c6e7e28270ad5a2cd02a2e2ada0a30f33d018601/orjson-3.10.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "hash": "e3e67b537ac0c835b25b5f7d40d83816abd2d3f4c0b0866ee981a045287a54f3", + "url": "https://files.pythonhosted.org/packages/f5/68/710fa568a27213968824d7673d2164b180700e7b05883970d0da6881a2ce/orjson-3.10.10-cp38-cp38-musllinux_1_2_aarch64.whl" }, { "algorithm": "sha256", - "hash": "4b6146e439af4c2472c56f8540d799a67a81226e11992008cb47e1267a9b3225", - "url": "https://files.pythonhosted.org/packages/fe/66/35857fdb7883d6f51c5d212693c51ad72f8b25b73fc043f424760b735ec6/orjson-3.10.7-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl" + "hash": "e0ceb5e0e8c4f010ac787d29ae6299846935044686509e2f0f06ed441c1ca949", + "url": "https://files.pythonhosted.org/packages/f5/79/242ecc469ccb2db9c8bec583c4c5d169c32a4da3713a5cf9d927c3d50df5/orjson-3.10.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" } ], "project_name": "orjson", "requires_dists": [], "requires_python": ">=3.8", - "version": "3.10.7" + "version": "3.10.10" }, { "artifacts": [ @@ -4181,22 +4181,27 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "bd5d4cd424bdd671d4c221395a145b219083d6e6a97e25a19dd8b3bea1088cbf", - "url": "git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master" + "hash": "6d7019d4d0d249b3116e0dc0c4a890c88e7795fbcd67ccbdadcccb4b2b1dce8d", + "url": "https://files.pythonhosted.org/packages/f8/a1/df863f4bb3524ce1ef186a02f0612544f10bb219e788db8483a867708a30/st2_auth_backend_flat_file-0.3.0-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "ffd3e752b57a25a7d236fe3c09818f7ff4c897ee1938d2abd7f349fc720a9031", + "url": "https://files.pythonhosted.org/packages/8d/ff/f7ca53ded009ae427f22f617de1e73d88b4221218111159a5205b52e2b94/st2-auth-backend-flat-file-0.3.0.tar.gz" } ], "project_name": "st2-auth-backend-flat-file", "requires_dists": [ - "passlib<1.8.0,>=1.7.1" + "passlib[bcrypt]<1.8.0,>=1.7.1" ], - "requires_python": null, - "version": "0.2.0" + "requires_python": ">=3.8", + "version": "0.3.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "b4bb3a51b74214607597e12a9594f10937226903d801951229ccbfe345461d51", + "hash": "87762aca30bfff91b56e1992f9943213c666cbdc1dc1427f8a8e2bf8afd6064a", "url": "git+https://github.com/StackStorm/st2-auth-ldap.git@master" } ], @@ -4205,7 +4210,7 @@ "cachetools<5.4.0,>=3.1", "python-ldap<3.5.0,>=3.4.0" ], - "requires_python": null, + "requires_python": ">=3.8", "version": "3.9.dev0" }, { @@ -4752,26 +4757,27 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "b60ba63f05c0cf61e086a10c3781a41fcfe30027753a8ae6d819c77592ce83ea", - "url": "https://files.pythonhosted.org/packages/c3/c2/fbc206db211c11ac85f2b440670ff6f43d44d7601f61b95628f56d271c21/WebOb-1.8.8-py2.py3-none-any.whl" + "hash": "45e34c58ed0c7e2ecd238ffd34432487ff13d9ad459ddfd77895e67abba7c1f9", + "url": "https://files.pythonhosted.org/packages/50/bd/c336448be43d40be28e71f2e0f3caf7ccb28e2755c58f4c02c065bfe3e8e/WebOb-1.8.9-py2.py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "2abc1555e118fc251e705fc6dc66c7f5353bb9fbfab6d20e22f1c02b4b71bcee", - "url": "https://files.pythonhosted.org/packages/a2/7a/ac5b1ab5636cc3bfc9bab1ed54ff4e8fdeb6367edd911f7337be2248b8ab/webob-1.8.8.tar.gz" + "hash": "ad6078e2edb6766d1334ec3dee072ac6a7f95b1e32ce10def8ff7f0f02d56589", + "url": "https://files.pythonhosted.org/packages/85/0b/1732085540b01f65e4e7999e15864fe14cd18b12a95731a43fd6fd11b26a/webob-1.8.9.tar.gz" } ], "project_name": "webob", "requires_dists": [ "Sphinx>=1.7.5; extra == \"docs\"", "coverage; extra == \"testing\"", + "legacy-cgi>=2.6; python_version >= \"3.13\"", "pylons-sphinx-themes; extra == \"docs\"", "pytest-cov; extra == \"testing\"", "pytest-xdist; extra == \"testing\"", "pytest>=3.1.0; extra == \"testing\"" ], "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7", - "version": "1.8.8" + "version": "1.8.9" }, { "artifacts": [ diff --git a/requirements.txt b/requirements.txt index 6fa213b3a7..48af736c32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ networkx==2.8.8 nose nose-parallel==0.4.0 nose-timer==1.0.1 -orjson==3.10.7 +orjson==3.10.10 orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 oslo.config==9.6.0 oslo.utils==7.3.0 @@ -76,7 +76,7 @@ tenacity==9.0.0 tooz==6.3.0 typing-extensions==4.12.2 unittest2 -webob==1.8.8 +webob==1.8.9 webtest zake==0.2.2 zipp==3.20.2 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index f16fe212e3..9a9e115af8 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -13,7 +13,7 @@ editor==1.6.6 importlib-metadata==7.1.0 jsonpath-rw==1.4.0 jsonschema==3.2.0 -orjson==3.10.7 +orjson==3.10.10 prettytable==3.10.2 prompt-toolkit==3.0.48 pyOpenSSL diff --git a/st2common/requirements.txt b/st2common/requirements.txt index f4eb409967..b55363d49a 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -26,7 +26,7 @@ kombu==5.4.2 lockfile==0.12.2 mongoengine==0.29.1 networkx==2.8.8 -orjson==3.10.7 +orjson==3.10.10 orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 oslo.config==9.6.0 paramiko==3.5.0 @@ -44,6 +44,6 @@ six==1.16.0 st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master tenacity==9.0.0 tooz==6.3.0 -webob==1.8.8 +webob==1.8.9 zake==0.2.2 zstandard==0.23.0 From f385ad3ce761daf2840895ef48a6bf4987827165 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 10:31:13 -0500 Subject: [PATCH 03/13] bump orquesta to latest commit Lockfile diff: lockfiles/st2.lock [st2] == Upgraded dependencies == chardet 3.0.4 --> 5.2.0 networkx 2.8.8 --> 3.1 redis 5.1.1 --> 5.2.0 --- .../orquesta_runner/in-requirements.txt | 2 +- .../runners/orquesta_runner/requirements.txt | 2 +- fixed-requirements.txt | 10 ++- lockfiles/st2.lock | 69 +++++++++---------- requirements-pants.txt | 2 +- requirements.txt | 8 +-- st2actions/requirements.txt | 2 +- st2client/requirements.txt | 2 +- st2common/in-requirements.txt | 2 +- st2common/requirements.txt | 8 +-- 10 files changed, 52 insertions(+), 55 deletions(-) diff --git a/contrib/runners/orquesta_runner/in-requirements.txt b/contrib/runners/orquesta_runner/in-requirements.txt index 8bf195dae4..3197648c25 100644 --- a/contrib/runners/orquesta_runner/in-requirements.txt +++ b/contrib/runners/orquesta_runner/in-requirements.txt @@ -1 +1 @@ -orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 +orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975 diff --git a/contrib/runners/orquesta_runner/requirements.txt b/contrib/runners/orquesta_runner/requirements.txt index cf26d58430..bc32b16e29 100644 --- a/contrib/runners/orquesta_runner/requirements.txt +++ b/contrib/runners/orquesta_runner/requirements.txt @@ -5,4 +5,4 @@ # If you want to update depdencies for a single component, modify the # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt -orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 +orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975 diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 55eed71679..c1272e879e 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -2,7 +2,7 @@ # Note: amqp is used by kombu amqp==5.2.0 apscheduler==3.10.4 -chardet==3.0.4 +chardet==5.2.0 cffi==1.17.1 cryptography==43.0.3 eventlet==0.37.0 @@ -23,10 +23,8 @@ lockfile==0.12.2 # >=0.23 was from jinja2 MarkupSafe==2.0.1 mongoengine==0.29.1 -# required by orquesta (networkx<2.6 for py3.6, networkx<3 for py3.8) -networkx==2.8.8 -# networkx dropped its dep on decorator in version 2.6, so the old pin is unneeded. -# now jsonpath-rw is the only thing that depends on decorator (a transitive dep) +networkx==3.1 +# jsonpath-rw is the only thing that depends on decorator (a transitive dep) decorator==5.1.1 # 202403: Bump oslo.config for py3.10 support. oslo.config==9.6.0 @@ -50,7 +48,7 @@ python-keyczar==0.716 pytz==2024.2 pywinrm==0.5.0 pyyaml==6.0.2 -redis==5.1.1 +redis==5.2.0 requests==2.32.3 retrying==1.3.4 routes==2.5.1 diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock index ece95eaf63..10bb94c190 100644 --- a/lockfiles/st2.lock +++ b/lockfiles/st2.lock @@ -40,7 +40,7 @@ // "nose-parallel", // "nose-timer", // "orjson", -// "orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0", +// "orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975", // "oslo.config", // "paramiko", // "pika", @@ -592,19 +592,19 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691", - "url": "https://files.pythonhosted.org/packages/bc/a9/01ffebfb562e4274b6487b4bb1ddec7ca55ec7510b22e4c51f14098443b8/chardet-3.0.4-py2.py3-none-any.whl" + "hash": "e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970", + "url": "https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", - "url": "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz" + "hash": "1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7", + "url": "https://files.pythonhosted.org/packages/f3/0d/f7b6ab21ec75897ed80c17d79b15951a719226b9fababf1e40ea74d69079/chardet-5.2.0.tar.gz" } ], "project_name": "chardet", "requires_dists": [], - "requires_python": null, - "version": "3.0.4" + "requires_python": ">=3.7", + "version": "5.2.0" }, { "artifacts": [ @@ -2222,13 +2222,13 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "e435dfa75b1d7195c7b8378c3859f0445cd88c6b0375c181ed66823a9ceb7524", - "url": "https://files.pythonhosted.org/packages/42/31/d2f89f1ae42718f8c8a9e440ebe38d7d5fe1e0d9eb9178ce779e365b3ab0/networkx-2.8.8-py3-none-any.whl" + "hash": "4f33f68cb2afcf86f28a45f43efc27a9386b535d567d2127f8f61d51dec58d36", + "url": "https://files.pythonhosted.org/packages/a8/05/9d4f9b78ead6b2661d6e8ea772e111fc4a9fbd866ad0c81906c11206b55e/networkx-3.1-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e", - "url": "https://files.pythonhosted.org/packages/cd/16/c44e8550012735b8f21b3df7f39e8ba5a987fb764ac017ad5f3589735889/networkx-2.8.8.tar.gz" + "hash": "de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61", + "url": "https://files.pythonhosted.org/packages/fd/a1/47b974da1a73f063c158a1f4cc33ed0abf7c04f98a19050e80c533c31f0c/networkx-3.1.tar.gz" } ], "project_name": "networkx", @@ -2236,26 +2236,26 @@ "codecov>=2.1; extra == \"test\"", "lxml>=4.6; extra == \"extra\"", "matplotlib>=3.4; extra == \"default\"", - "mypy>=0.982; extra == \"developer\"", + "mypy>=1.1; extra == \"developer\"", "nb2plots>=0.6; extra == \"doc\"", - "numpy>=1.19; extra == \"default\"", + "numpy>=1.20; extra == \"default\"", "numpydoc>=1.5; extra == \"doc\"", "pandas>=1.3; extra == \"default\"", - "pillow>=9.2; extra == \"doc\"", - "pre-commit>=2.20; extra == \"developer\"", - "pydata-sphinx-theme>=0.11; extra == \"doc\"", + "pillow>=9.4; extra == \"doc\"", + "pre-commit>=3.2; extra == \"developer\"", + "pydata-sphinx-theme>=0.13; extra == \"doc\"", "pydot>=1.4.2; extra == \"extra\"", - "pygraphviz>=1.9; extra == \"extra\"", + "pygraphviz>=1.10; extra == \"extra\"", "pytest-cov>=4.0; extra == \"test\"", "pytest>=7.2; extra == \"test\"", "scipy>=1.8; extra == \"default\"", - "sphinx-gallery>=0.11; extra == \"doc\"", - "sphinx>=5.2; extra == \"doc\"", + "sphinx-gallery>=0.12; extra == \"doc\"", + "sphinx>=6.1; extra == \"doc\"", "sympy>=1.10; extra == \"extra\"", - "texext>=0.6.6; extra == \"doc\"" + "texext>=0.6.7; extra == \"doc\"" ], "requires_python": ">=3.8", - "version": "2.8.8" + "version": "3.1" }, { "artifacts": [ @@ -2405,21 +2405,20 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "4857472090b6a48dcc8ff3f8f3d0ec5145270ecb253d84aec3f98e2fd14bc9dc", - "url": "git+https://github.com/StackStorm/orquesta.git@v1.6.0" + "hash": "cc9f9827d1a062352b80a9b0c2b4b7de12987885e56990f0045f0345dc032e9d", + "url": "git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975" } ], "project_name": "orquesta", "requires_dists": [ - "Jinja2>=2.11", - "PyYAML>=3.1.0", - "chardet<4.0.0,>=3.0.2", + "chardet>=3.0.2", "eventlet", - "jsonschema!=2.5.0,<=3.2,>=2.0.0", - "networkx<2.6,>=2.5.1; python_version < \"3.7\"", - "networkx<3,>=2.6; python_version >= \"3.7\"", + "jinja2>=2.11", + "jsonschema<4,>=3", + "networkx<3.2,>=2.6", "python-dateutil", - "six>=1.9.0", + "pyyaml>=5.3.1", + "six>=1.14.0", "stevedore>=1.3.0", "ujson>=1.35", "yaql>=1.1.0" @@ -3582,13 +3581,13 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "f8ea06b7482a668c6475ae202ed8d9bcaa409f6e87fb77ed1043d912afd62e24", - "url": "https://files.pythonhosted.org/packages/15/f1/feeeaaaac0f589bcbc12c02da357cf635ee383c9128b77230a1e99118885/redis-5.1.1-py3-none-any.whl" + "hash": "ae174f2bb3b1bf2b09d54bf3e51fbc1469cf6c10aa03e21141f51969801a7897", + "url": "https://files.pythonhosted.org/packages/12/f5/ffa560ecc4bafbf25f7961c3d6f50d627a90186352e27e7d0ba5b1f6d87d/redis-5.2.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "f6c997521fedbae53387307c5d0bf784d9acc28d9f1d058abeac566ec4dbed72", - "url": "https://files.pythonhosted.org/packages/e0/58/dcf97c3c09d429c3bb830d6075322256da3dba42df25359bd1c82b442d20/redis-5.1.1.tar.gz" + "hash": "0b1087665a771b1ff2e003aa5bdd354f15a70c9e25d5a7dbf9c722c16528a7b0", + "url": "https://files.pythonhosted.org/packages/53/17/2f4a87ffa4cd93714cf52edfa3ea94589e9de65f71e9f99cbcfa84347a53/redis-5.2.0.tar.gz" } ], "project_name": "redis", @@ -3600,7 +3599,7 @@ "requests>=2.31.0; extra == \"ocsp\"" ], "requires_python": ">=3.8", - "version": "5.1.1" + "version": "5.2.0" }, { "artifacts": [ diff --git a/requirements-pants.txt b/requirements-pants.txt index d1f98e7331..f61f508ec6 100644 --- a/requirements-pants.txt +++ b/requirements-pants.txt @@ -33,7 +33,7 @@ mongoengine>=0.24.0,<0.30.0 # networkx version is constrained in orquesta. networkx orjson -orquesta @ git+https://github.com/StackStorm/orquesta.git@v1.6.0 +orquesta @ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975 # Historical reference: https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 # Relaxed pinning for py3.10 support. oslo.config diff --git a/requirements.txt b/requirements.txt index 48af736c32..a1fa4ca620 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ apscheduler==3.10.4 argcomplete==3.4.0 bcrypt==4.2.0 cffi==1.17.1 -chardet==3.0.4 +chardet==5.2.0 ciso8601 cryptography==43.0.3 decorator==5.1.1 @@ -33,12 +33,12 @@ lockfile==0.12.2 logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux" mock==5.1.0 mongoengine==0.29.1 -networkx==2.8.8 +networkx==3.1 nose nose-parallel==0.4.0 nose-timer==1.0.1 orjson==3.10.10 -orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 +orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975 oslo.config==9.6.0 oslo.utils==7.3.0 paramiko==3.5.0 @@ -59,7 +59,7 @@ python-statsd==2.1.0 pytz==2024.2 pywinrm==0.5.0 pyyaml==6.0.2 -redis==5.1.1 +redis==5.2.0 rednose requests==2.32.3 retrying==1.3.4 diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index a8a6829ad9..31f91031fd 100644 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -7,7 +7,7 @@ # update the component requirements.txt MarkupSafe==2.0.1 apscheduler==3.10.4 -chardet==3.0.4 +chardet==5.2.0 eventlet==0.37.0 gitpython==3.1.43 jinja2==3.1.4 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 9a9e115af8..bd7c6950fb 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -7,7 +7,7 @@ # update the component requirements.txt argcomplete==3.4.0 cffi==1.17.1 -chardet==3.0.4 +chardet==5.2.0 cryptography==43.0.3 editor==1.6.6 importlib-metadata==7.1.0 diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index 1daa52fb8e..fb18210b1b 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -14,7 +14,7 @@ mongoengine networkx # used by networkx decorator -orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 +orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975 st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master oslo.config paramiko diff --git a/st2common/requirements.txt b/st2common/requirements.txt index b55363d49a..63fff0d3db 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -9,7 +9,7 @@ MarkupSafe==2.0.1 amqp==5.2.0 apscheduler==3.10.4 cffi==1.17.1 -chardet==3.0.4 +chardet==5.2.0 ciso8601 cryptography==43.0.3 decorator==5.1.1 @@ -25,9 +25,9 @@ jsonschema==3.2.0 kombu==5.4.2 lockfile==0.12.2 mongoengine==0.29.1 -networkx==2.8.8 +networkx==3.1 orjson==3.10.10 -orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 +orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975 oslo.config==9.6.0 paramiko==3.5.0 pyOpenSSL @@ -35,7 +35,7 @@ pymongo==4.6.3 python-dateutil==2.9.0.post0 python-statsd==2.1.0 pyyaml==6.0.2 -redis==5.1.1 +redis==5.2.0 requests==2.32.3 retrying==1.3.4 routes==2.5.1 From 731cdd19a5de2aace35f53a59f05671c15dd8284 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 11:05:29 -0500 Subject: [PATCH 04/13] drop extra comment char in test-requirements.txt --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 0107109f58..4ecb5e1914 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,7 @@ isort>=4.2.5 mock==5.1.0 nose>=1.3.7 tabulate -# # 4.5.0 required for Jinja-3.1.3 support but >5.0 required by rstcheck and lower than 7.2 which drops py3.8 support +# 4.5.0 required for Jinja-3.1.3 support but >5.0 required by rstcheck and lower than 7.2 which drops py3.8 support sphinx>=5.0.0,<7.2.0 sphinx-autobuild # pin alabaster (sphinx dependency) or pip installs one that is not compatible From 36e91d7ca60e705f4ad968e2dc1535fe0e7e0a79 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 29 Mar 2024 14:36:42 +0100 Subject: [PATCH 05/13] Bump linting tools --- test-requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 4ecb5e1914..308a49bb42 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,9 +1,8 @@ # 7.5 causing errors with orquesta integration tests (probably interaction w/ nose) coverage<7.5 pep8==1.7.1 -# st2flake8 does not support flake8 v5 yet -flake8==4.0.1 -st2flake8==0.1.0 +flake8==7.0.0 +st2-flake8 @ git+https://github.com/nzlosh/st2-flake8@master astroid==3.1.0 pylint==3.1.0 pylint-plugin-utils>=0.4 From 45391931a7224366af9328b1adb52b3ae454d40e Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 11:08:49 -0500 Subject: [PATCH 06/13] use released version of st2flake8 w/ flake8==7.0.0 Lockfile diff: lockfiles/flake8.lock [flake8] == Upgraded dependencies == flake8 4.0.1 --> 7.0.0 flake8-copyright 0.2.2 --> 0.2.4 mccabe 0.6.1 --> 0.7.0 pycodestyle 2.8.0 --> 2.11.1 pyflakes 2.4.0 --> 3.2.0 setuptools 69.2.0 --> 75.2.0 st2flake8 0.1.0 --> 0.2.0 == Removed dependencies == flake8-polyfill 1.0.2 --- BUILD.tools | 4 +- lockfiles/flake8.lock | 235 ++++++++++++++++++++---------------------- pants.toml | 3 +- test-requirements.txt | 2 +- 4 files changed, 114 insertions(+), 130 deletions(-) diff --git a/BUILD.tools b/BUILD.tools index 002188450f..8dee0061cf 100644 --- a/BUILD.tools +++ b/BUILD.tools @@ -23,9 +23,9 @@ python_requirement( name="flake8-reqs", resolve="flake8", requirements=[ - "flake8==4.0.1", # st2flake8 does not support flake8 v5 + "flake8==7.0.0", # st2flake8 does not support flake8 v5 # license check plugin - "st2flake8==0.1.0", # TODO: remove in favor of regex-lint or preamble + "st2flake8>0.1.0", # TODO: remove in favor of regex-lint or preamble ], ) diff --git a/lockfiles/flake8.lock b/lockfiles/flake8.lock index 325effdb9c..e5a3c53ae7 100644 --- a/lockfiles/flake8.lock +++ b/lockfiles/flake8.lock @@ -6,11 +6,11 @@ // { // "version": 3, // "valid_for_interpreter_constraints": [ -// "CPython<3.10,>=3.8" +// "CPython<3.10,>=3.8.1" // ], // "generated_with_requirements": [ -// "flake8==4.0.1", -// "st2flake8==0.1.0" +// "flake8==7.0.0", +// "st2flake8>0.1.0" // ], // "manylinux": "manylinux2014", // "requirement_constraints": [], @@ -25,6 +25,7 @@ "allow_wheels": true, "build_isolation": true, "constraints": [], + "excluded": [], "locked_resolves": [ { "locked_requirements": [ @@ -32,41 +33,35 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d", - "url": "https://files.pythonhosted.org/packages/34/39/cde2c8a227abb4f9ce62fe55586b920f438f1d2903a1a22514d0b982c333/flake8-4.0.1-py2.py3-none-any.whl" + "hash": "a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3", + "url": "https://files.pythonhosted.org/packages/e3/01/cc8cdec7b61db0315c2ab62d80677a138ef06832ec17f04d87e6ef858f7f/flake8-7.0.0-py2.py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d", - "url": "https://files.pythonhosted.org/packages/e6/84/d8db922289195c435779b4ca3a3f583f263f87e67954f7b2e83c8da21f48/flake8-4.0.1.tar.gz" + "hash": "33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132", + "url": "https://files.pythonhosted.org/packages/40/3c/3464b567aa367b221fa610bbbcce8015bf953977d21e52f2d711b526fb48/flake8-7.0.0.tar.gz" } ], "project_name": "flake8", "requires_dists": [ - "importlib-metadata<4.3; python_version < \"3.8\"", - "mccabe<0.7.0,>=0.6.0", - "pycodestyle<2.9.0,>=2.8.0", - "pyflakes<2.5.0,>=2.4.0" + "mccabe<0.8.0,>=0.7.0", + "pycodestyle<2.12.0,>=2.11.0", + "pyflakes<3.3.0,>=3.2.0" ], - "requires_python": ">=3.6", - "version": "4.0.1" + "requires_python": ">=3.8.1", + "version": "7.0.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "dbad92ee5f51398722cd571b6e36cc3651914bf1b286b0e638bba1f4af0b6f5b", - "url": "https://files.pythonhosted.org/packages/af/9c/a8ad17f373dfad4c0fea345290ef8ce54d63b76a3166d6bb57030d7a6d59/flake8_copyright-0.2.2-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "616a960c9602ad2d0136bf3f12564e253caffe82f151d2982f78a12a42e1faa0", - "url": "https://files.pythonhosted.org/packages/17/83/19b630889d8c3291a04ddb6ab5bf691618a07a11be239c15f2b524708b93/flake8_copyright-0.2.2-py2.py3-none-any.whl" + "hash": "5d33d900c4183bb6748692407867229d1e5b84016a100e8899a7f58dcf52223f", + "url": "https://files.pythonhosted.org/packages/b6/11/6e36be1703a28cb91e97aca402df49027ae3a05a6405d836a98b8dc24306/flake8_copyright-0.2.4-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "5c3632dd8c586547b25fff4272282005fdbcba56eeb77b7487564aa636b6e533", - "url": "https://files.pythonhosted.org/packages/66/35/3a5712611f8345329582817c71db68f6a1b6f4d500efeaeca1137b241417/flake8-copyright-0.2.2.tar.gz" + "hash": "b78491fcf575266d7e78dcfa899c876edd1c29929d247de3408bf4e3f971bf1c", + "url": "https://files.pythonhosted.org/packages/f0/8d/2a98bea4c71203fe1cc01f36af5ac222664f816834ea5d778e0a237c5325/flake8-copyright-0.2.4.tar.gz" } ], "project_name": "flake8-copyright", @@ -74,184 +69,172 @@ "setuptools" ], "requires_python": null, - "version": "0.2.2" + "version": "0.2.4" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9", - "url": "https://files.pythonhosted.org/packages/86/b5/a43fed6fd0193585d17d6faa7b85317d4461f694aaed546098c69f856579/flake8_polyfill-1.0.2-py2.py3-none-any.whl" + "hash": "6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", + "url": "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda", - "url": "https://files.pythonhosted.org/packages/e6/67/1c26634a770db5c442e361311bee73cb3a177adb2eb3f7af8953cfd9f553/flake8-polyfill-1.0.2.tar.gz" - } - ], - "project_name": "flake8-polyfill", - "requires_dists": [ - "flake8" - ], - "requires_python": null, - "version": "1.0.2" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", - "url": "https://files.pythonhosted.org/packages/87/89/479dc97e18549e21354893e4ee4ef36db1d237534982482c3681ee6e7b57/mccabe-0.6.1-py2.py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f", - "url": "https://files.pythonhosted.org/packages/06/18/fa675aa501e11d6d6ca0ae73a101b2f3571a565e0f7d38e062eec18a91ee/mccabe-0.6.1.tar.gz" + "hash": "348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", + "url": "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz" } ], "project_name": "mccabe", "requires_dists": [], - "requires_python": null, - "version": "0.6.1" + "requires_python": ">=3.6", + "version": "0.7.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20", - "url": "https://files.pythonhosted.org/packages/15/94/bc43a2efb7b8615e38acde2b6624cae8c9ec86faf718ff5676c5179a7714/pycodestyle-2.8.0-py2.py3-none-any.whl" + "hash": "44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67", + "url": "https://files.pythonhosted.org/packages/b1/90/a998c550d0ddd07e38605bb5c455d00fcc177a800ff9cc3dafdcb3dd7b56/pycodestyle-2.11.1-py2.py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f", - "url": "https://files.pythonhosted.org/packages/08/dc/b29daf0a202b03f57c19e7295b60d1d5e1281c45a6f5f573e41830819918/pycodestyle-2.8.0.tar.gz" + "hash": "41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f", + "url": "https://files.pythonhosted.org/packages/34/8f/fa09ae2acc737b9507b5734a9aec9a2b35fa73409982f57db1b42f8c3c65/pycodestyle-2.11.1.tar.gz" } ], "project_name": "pycodestyle", "requires_dists": [], - "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7", - "version": "2.8.0" + "requires_python": ">=3.8", + "version": "2.11.1" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e", - "url": "https://files.pythonhosted.org/packages/43/fb/38848eb494af7df9aeb2d7673ace8b213313eb7e391691a79dbaeb6a838f/pyflakes-2.4.0-py2.py3-none-any.whl" + "hash": "84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a", + "url": "https://files.pythonhosted.org/packages/d4/d7/f1b7db88d8e4417c5d47adad627a93547f44bdc9028372dbd2313f34a855/pyflakes-3.2.0-py2.py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c", - "url": "https://files.pythonhosted.org/packages/15/60/c577e54518086e98470e9088278247f4af1d39cb43bcbd731e2c307acd6a/pyflakes-2.4.0.tar.gz" + "hash": "1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f", + "url": "https://files.pythonhosted.org/packages/57/f9/669d8c9c86613c9d568757c7f5824bd3197d7b1c6c27553bc5618a27cce2/pyflakes-3.2.0.tar.gz" } ], "project_name": "pyflakes", "requires_dists": [], - "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7", - "version": "2.4.0" + "requires_python": ">=3.8", + "version": "3.2.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c", - "url": "https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl" + "hash": "a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8", + "url": "https://files.pythonhosted.org/packages/31/2d/90165d51ecd38f9a02c6832198c13a4e48652485e2ccf863ebb942c531b6/setuptools-75.2.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e", - "url": "https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d/setuptools-69.2.0.tar.gz" + "hash": "753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec", + "url": "https://files.pythonhosted.org/packages/07/37/b31be7e4b9f13b59cde9dcaeff112d401d49e0dc5b37ed4a9fc8fb12f409/setuptools-75.2.0.tar.gz" } ], "project_name": "setuptools", "requires_dists": [ - "build[virtualenv]; extra == \"testing\"", - "build[virtualenv]>=1.0.3; extra == \"testing-integration\"", - "filelock>=3.4.0; extra == \"testing\"", - "filelock>=3.4.0; extra == \"testing-integration\"", - "furo; extra == \"docs\"", - "importlib-metadata; extra == \"testing\"", - "ini2toml[lite]>=0.9; extra == \"testing\"", - "jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"testing\"", - "jaraco.envs>=2.2; extra == \"testing\"", - "jaraco.envs>=2.2; extra == \"testing-integration\"", - "jaraco.packaging>=9.3; extra == \"docs\"", - "jaraco.path>=3.2.0; extra == \"testing\"", - "jaraco.path>=3.2.0; extra == \"testing-integration\"", - "jaraco.tidelift>=1.4; extra == \"docs\"", - "mypy==1.9; extra == \"testing\"", - "packaging>=23.2; extra == \"testing\"", - "packaging>=23.2; extra == \"testing-integration\"", - "pip>=19.1; extra == \"testing\"", - "pygments-github-lexers==0.0.5; extra == \"docs\"", - "pytest-checkdocs>=2.4; extra == \"testing\"", - "pytest-cov; platform_python_implementation != \"PyPy\" and extra == \"testing\"", - "pytest-enabler; extra == \"testing-integration\"", - "pytest-enabler>=2.2; extra == \"testing\"", - "pytest-home>=0.5; extra == \"testing\"", - "pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"", - "pytest-perf; sys_platform != \"cygwin\" and extra == \"testing\"", - "pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"testing\"", - "pytest-timeout; extra == \"testing\"", - "pytest-xdist; extra == \"testing-integration\"", - "pytest-xdist>=3; extra == \"testing\"", - "pytest; extra == \"testing-integration\"", - "pytest>=6; extra == \"testing\"", - "rst.linker>=1.9; extra == \"docs\"", - "sphinx-favicon; extra == \"docs\"", - "sphinx-inline-tabs; extra == \"docs\"", - "sphinx-lint; extra == \"docs\"", - "sphinx-notfound-page<2,>=1; extra == \"docs\"", - "sphinx-reredirects; extra == \"docs\"", - "sphinx<7.2.5; extra == \"docs\"", - "sphinx>=3.5; extra == \"docs\"", - "sphinxcontrib-towncrier; extra == \"docs\"", - "tomli-w>=1.0.0; extra == \"testing\"", - "tomli; extra == \"testing\"", - "tomli; extra == \"testing-integration\"", - "virtualenv>=13.0.0; extra == \"testing\"", - "virtualenv>=13.0.0; extra == \"testing-integration\"", - "wheel; extra == \"testing\"", - "wheel; extra == \"testing-integration\"" + "build[virtualenv]>=1.0.3; extra == \"test\"", + "filelock>=3.4.0; extra == \"test\"", + "furo; extra == \"doc\"", + "importlib-metadata>=6; python_version < \"3.10\" and extra == \"core\"", + "importlib-metadata>=7.0.2; python_version < \"3.10\" and extra == \"type\"", + "importlib-resources>=5.10.2; python_version < \"3.9\" and extra == \"core\"", + "ini2toml[lite]>=0.14; extra == \"test\"", + "jaraco.collections; extra == \"core\"", + "jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"test\"", + "jaraco.develop>=7.21; sys_platform != \"cygwin\" and extra == \"type\"", + "jaraco.envs>=2.2; extra == \"test\"", + "jaraco.functools; extra == \"core\"", + "jaraco.packaging>=9.3; extra == \"doc\"", + "jaraco.path>=3.2.0; extra == \"test\"", + "jaraco.test; extra == \"test\"", + "jaraco.text>=3.7; extra == \"core\"", + "jaraco.tidelift>=1.4; extra == \"doc\"", + "more-itertools; extra == \"core\"", + "more-itertools>=8.8; extra == \"core\"", + "mypy==1.11.*; extra == \"type\"", + "packaging; extra == \"core\"", + "packaging>=23.2; extra == \"test\"", + "packaging>=24; extra == \"core\"", + "pip>=19.1; extra == \"test\"", + "platformdirs>=2.6.2; extra == \"core\"", + "pygments-github-lexers==0.0.5; extra == \"doc\"", + "pyproject-hooks!=1.1; extra == \"doc\"", + "pyproject-hooks!=1.1; extra == \"test\"", + "pytest!=8.1.*,>=6; extra == \"test\"", + "pytest-checkdocs>=2.4; extra == \"check\"", + "pytest-cov; extra == \"cover\"", + "pytest-enabler>=2.2; extra == \"enabler\"", + "pytest-home>=0.5; extra == \"test\"", + "pytest-mypy; extra == \"type\"", + "pytest-perf; sys_platform != \"cygwin\" and extra == \"test\"", + "pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"check\"", + "pytest-subprocess; extra == \"test\"", + "pytest-timeout; extra == \"test\"", + "pytest-xdist>=3; extra == \"test\"", + "rst.linker>=1.9; extra == \"doc\"", + "ruff>=0.5.2; sys_platform != \"cygwin\" and extra == \"check\"", + "sphinx-favicon; extra == \"doc\"", + "sphinx-inline-tabs; extra == \"doc\"", + "sphinx-lint; extra == \"doc\"", + "sphinx-notfound-page<2,>=1; extra == \"doc\"", + "sphinx-reredirects; extra == \"doc\"", + "sphinx>=3.5; extra == \"doc\"", + "sphinxcontrib-towncrier; extra == \"doc\"", + "tomli-w>=1.0.0; extra == \"test\"", + "tomli>=2.0.1; python_version < \"3.11\" and extra == \"core\"", + "towncrier<24.7; extra == \"doc\"", + "virtualenv>=13.0.0; extra == \"test\"", + "wheel>=0.43.0; extra == \"core\"", + "wheel>=0.44.0; extra == \"test\"" ], "requires_python": ">=3.8", - "version": "69.2.0" + "version": "75.2.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "8e163d489ca8d20a43ccd428acbefdfd451fb38d624d140e6711d510530db01a", - "url": "https://files.pythonhosted.org/packages/81/4c/8ece3543c6153bbf1883629e5fe7270b43aebf0bd7c85c552aedc0555b13/st2flake8-0.1.0-py3-none-any.whl" + "hash": "d9e64bcf917efc6150f1f1983140f6839acff60e25126b605549c6c962a1943d", + "url": "https://files.pythonhosted.org/packages/5d/a5/dc538953534164ca5a599e9184d1c3833b5f683ca8a8c1cdf8e596ff8432/st2flake8-0.2.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "4808e5ba811b792eec8a255988a3d1d3e615768dbc89d043774cf821d4584a8f", - "url": "https://files.pythonhosted.org/packages/64/c7/9b6dd9ba15a44a6fd9aa733beb4a2ca9d9234bf57b8a828d4b6c127fe427/st2flake8-0.1.0.tar.gz" + "hash": "abf17ded90c2895f7af94fd45ae3205ab2b6c1d5172334e52baf1b55ae63c420", + "url": "https://files.pythonhosted.org/packages/f7/24/afaa38ffd3b38f2d7cc92368e6ec2c41d54a7dc77ff9e51dce39944c239f/st2flake8-0.2.0.tar.gz" } ], "project_name": "st2flake8", "requires_dists": [ - "flake8-copyright==0.2.2", - "flake8-polyfill==1.0.2" + "flake8-copyright==0.2.4" ], "requires_python": null, - "version": "0.1.0" + "version": "0.2.0" } ], "platform_tag": null } ], + "only_builds": [], + "only_wheels": [], + "overridden": [], "path_mappings": {}, - "pex_version": "2.1.137", - "pip_version": "23.1.2", + "pex_version": "2.16.2", + "pip_version": "24.0", "prefer_older_binary": false, "requirements": [ - "flake8==4.0.1", - "st2flake8==0.1.0" + "flake8==7.0.0", + "st2flake8>0.1.0" ], "requires_python": [ - "<3.10,>=3.8" + "<3.10,>=3.8.1" ], "resolver_version": "pip-2020-resolver", "style": "universal", diff --git a/pants.toml b/pants.toml index e4a673e2b8..8cccd1f2cd 100644 --- a/pants.toml +++ b/pants.toml @@ -115,6 +115,7 @@ pants_plugins_interpreter_constraints = "CPython==3.9.*" # For tools, we have to include python versions for BOTH st2 and pants-plugins tool_interpreter_constraints = "CPython>=3.8,<3.10" +flake8_interpreter_constraints = "CPython>=3.8.1,<3.10" [python] # resolver_version is always "pip-2020-resolver". legacy is not supported. @@ -138,7 +139,7 @@ twine = "lockfiles/twine.lock" [python.resolves_to_interpreter_constraints] bandit = ["%(tool_interpreter_constraints)s"] black = ["%(tool_interpreter_constraints)s"] -flake8 = ["%(tool_interpreter_constraints)s"] +flake8 = ["%(flake8_interpreter_constraints)s"] pants-plugins = ["%(pants_plugins_interpreter_constraints)s"] pylint = ["%(tool_interpreter_constraints)s"] pytest = ["%(tool_interpreter_constraints)s"] diff --git a/test-requirements.txt b/test-requirements.txt index 308a49bb42..48a851fe89 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ coverage<7.5 pep8==1.7.1 flake8==7.0.0 -st2-flake8 @ git+https://github.com/nzlosh/st2-flake8@master +st2flake8>0.1.0 astroid==3.1.0 pylint==3.1.0 pylint-plugin-utils>=0.4 From 69bb9f669c6af3751a60f9f490a4c3b3b55e2cae Mon Sep 17 00:00:00 2001 From: Carlos Date: Wed, 3 Apr 2024 00:31:05 +0200 Subject: [PATCH 07/13] Update requirements for py3.8, py3.9 and py3.10 --- fixed-requirements.txt | 8 +++++++- test-requirements.txt | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index c1272e879e..3e02578ba0 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -1,4 +1,10 @@ -# Packages versions fixed for the whole st2 stack +# Package versions fixed (pinned) for the whole st2 project. +# Important: Keep version constraints synchronised with the below repositories: +# - https://github.com/StackStorm/st2docs +# - https://github.com/StackStorm/orquesta +# - https://github.com/StackStorm/st2-auth-ldap +# - https://github.com/StackStorm/st2-rbac-backend +# ---------------------------------------------------------------------- # Note: amqp is used by kombu amqp==5.2.0 apscheduler==3.10.4 diff --git a/test-requirements.txt b/test-requirements.txt index 48a851fe89..8e3aa9e889 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,9 @@ +# Important: Keep version constraints synchronised with the below repositories: +# - https://github.com/StackStorm/st2docs +# - https://github.com/StackStorm/orquesta +# - https://github.com/StackStorm/st2-auth-ldap +# - https://github.com/StackStorm/st2-rbac-backend +# ---------------------------------------------------------------------- # 7.5 causing errors with orquesta integration tests (probably interaction w/ nose) coverage<7.5 pep8==1.7.1 @@ -9,7 +15,6 @@ pylint-plugin-utils>=0.4 black==22.3.0 pre-commit==2.1.0 bandit==1.7.0 -ipython<6.0.0 isort>=4.2.5 mock==5.1.0 nose>=1.3.7 @@ -34,7 +39,7 @@ psutil==6.0.0 webtest==3.0.1 # Bump to latest to meet sphinx requirements. rstcheck==6.2.1 -tox==3.23.0 +tox==4.14.2 pyrabbit prance==23.6.21.0 # pip-tools provides pip-compile: to check for version conflicts From 5304a209bc21f2d1cba2ca8320fc0fbac1c21c12 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 12:10:00 -0500 Subject: [PATCH 08/13] drop MarkupSafe constraint that was only needed for Jinja2<3 Lockfile diff: lockfiles/st2.lock [st2] == Upgraded dependencies == flask 2.1.3 --> 3.0.3 markupsafe 2.0.1 --> 2.1.5 werkzeug 2.1.2 --> 3.0.4 == Added dependencies == blinker 1.8.2 --- fixed-requirements.txt | 3 - lockfiles/st2-constraints.txt | 6 -- lockfiles/st2.lock | 184 ++++++++++++++------------------- requirements.txt | 1 - st2actions/in-requirements.txt | 2 - st2actions/requirements.txt | 1 - st2common/in-requirements.txt | 2 - st2common/requirements.txt | 1 - 8 files changed, 75 insertions(+), 125 deletions(-) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 3e02578ba0..f728439328 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -25,9 +25,6 @@ jsonpath-rw==1.4.0 jsonschema==3.2.0 kombu==5.4.2 lockfile==0.12.2 -# Fix MarkupSafe to < 2.1.0 as 2.1.0 removes soft_unicode -# >=0.23 was from jinja2 -MarkupSafe==2.0.1 mongoengine==0.29.1 networkx==3.1 # jsonpath-rw is the only thing that depends on decorator (a transitive dep) diff --git a/lockfiles/st2-constraints.txt b/lockfiles/st2-constraints.txt index af830bdf83..24d85a0a37 100644 --- a/lockfiles/st2-constraints.txt +++ b/lockfiles/st2-constraints.txt @@ -16,12 +16,6 @@ # pinned transitive deps from requirements.txt # # ############################################ # -# REQUIRED BY: jinja2 -# REASON: Fix MarkupSafe to < 2.1.0 as 2.1.0 removes soft_unicode >=0.23 was from jinja2 -# NOTE: try to remove constraint later. -# DROPS RESOLVED VERSION: unknown -MarkupSafe<2.1.0,>=0.23 - # REQUIRED BY: kombu # REASON: unknown -- this looks like a lockfile-style pin # kombu 5.0.2 requires amqp>=5.0.0,<6.0.0 diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock index 10bb94c190..9e25eb11aa 100644 --- a/lockfiles/st2.lock +++ b/lockfiles/st2.lock @@ -86,9 +86,7 @@ // "zstandard" // ], // "manylinux": "manylinux2014", -// "requirement_constraints": [ -// "MarkupSafe<2.1.0,>=0.23" -// ], +// "requirement_constraints": [], // "only_binary": [], // "no_binary": [] // } @@ -99,9 +97,7 @@ "allow_prereleases": false, "allow_wheels": true, "build_isolation": true, - "constraints": [ - "MarkupSafe<2.1.0,>=0.23" - ], + "constraints": [], "excluded": [], "locked_resolves": [ { @@ -457,6 +453,24 @@ "requires_python": ">=3.6.0", "version": "4.12.3" }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01", + "url": "https://files.pythonhosted.org/packages/bb/2a/10164ed1f31196a2f7f3799368a821765c62851ead0e630ab52b8e14b4d0/blinker-1.8.2-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83", + "url": "https://files.pythonhosted.org/packages/1e/57/a6a1721eff09598fb01f3c7cda070c1b6a0f12d63c83236edf79a440abcc/blinker-1.8.2.tar.gz" + } + ], + "project_name": "blinker", + "requires_dists": [], + "requires_python": ">=3.8", + "version": "1.8.2" + }, { "artifacts": [ { @@ -1213,27 +1227,28 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "9013281a7402ad527f8fd56375164f3aa021ecfaff89bfe3825346c24f87e04c", - "url": "https://files.pythonhosted.org/packages/af/6a/00d144ac1626fbb44c4ff36519712e258128985a5d0ae43344778ae5cbb9/Flask-2.1.3-py3-none-any.whl" + "hash": "34e815dfaa43340d1d15a5c3a02b8476004037eb4840b34910c6e21679d288f3", + "url": "https://files.pythonhosted.org/packages/61/80/ffe1da13ad9300f87c93af113edd0638c75138c42a0994becfacac078c06/flask-3.0.3-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "15972e5017df0575c3d6c090ba168b6db90259e620ac8d7ea813a396bad5b6cb", - "url": "https://files.pythonhosted.org/packages/5b/77/3accd62b8771954e9584beb03f080385b32ddcad30009d2a4fe4068a05d9/Flask-2.1.3.tar.gz" + "hash": "ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842", + "url": "https://files.pythonhosted.org/packages/41/e1/d104c83026f8d35dfd2c261df7d64738341067526406b40190bc063e829a/flask-3.0.3.tar.gz" } ], "project_name": "flask", "requires_dists": [ - "Jinja2>=3.0", - "Werkzeug>=2.0", + "Jinja2>=3.1.2", + "Werkzeug>=3.0.0", "asgiref>=3.2; extra == \"async\"", - "click>=8.0", + "blinker>=1.6.2", + "click>=8.1.3", "importlib-metadata>=3.6.0; python_version < \"3.10\"", - "itsdangerous>=2.0", + "itsdangerous>=2.1.2", "python-dotenv; extra == \"dotenv\"" ], - "requires_python": ">=3.7", - "version": "2.1.3" + "requires_python": ">=3.8", + "version": "3.0.3" }, { "artifacts": [ @@ -1873,144 +1888,94 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1", - "url": "https://files.pythonhosted.org/packages/3b/41/f53e2ac439b309d8bb017d12ee6e7d393aa70c508448c1f30a7e5db9d69e/MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194", - "url": "https://files.pythonhosted.org/packages/15/90/b63743e72c9ffc5988c7b1c04d14f9a32ae49574afe8a7fbea0ce538bda4/MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl" - }, - { - "algorithm": "sha256", - "hash": "7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b", - "url": "https://files.pythonhosted.org/packages/1d/c5/1d1b42c65f96ee7b0c81761260878d1a1dc0afdf259e434b7d7af88a80a3/MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee", - "url": "https://files.pythonhosted.org/packages/1f/44/ada8e01854175525e8e139278c3a52fec0ef720307cbd670bca86b473b56/MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl" + "hash": "5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6", + "url": "https://files.pythonhosted.org/packages/02/8c/ab9a463301a50dab04d5472e998acbd4080597abc048166ded5c7aa768c8/MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_x86_64.whl" }, { "algorithm": "sha256", - "hash": "f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5", - "url": "https://files.pythonhosted.org/packages/50/99/06eccf68be0bff67ab9a0b90b5382c04769f9ad2e42cae5e5e92f99380cd/MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl" + "hash": "bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e", + "url": "https://files.pythonhosted.org/packages/0b/cc/48206bd61c5b9d0129f4d75243b156929b04c94c09041321456fd06a876d/MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_aarch64.whl" }, { "algorithm": "sha256", - "hash": "5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9", - "url": "https://files.pythonhosted.org/packages/51/1e/45e25cd867fb79339c49086dad9794e11923dd6325251ae48c341b0a4271/MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl" + "hash": "8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3", + "url": "https://files.pythonhosted.org/packages/0e/7d/968284145ffd9d726183ed6237c77938c021abacde4e073020f920e060b2/MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_x86_64.whl" }, { "algorithm": "sha256", - "hash": "4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135", - "url": "https://files.pythonhosted.org/packages/5a/ff/34bdcd8cc794f692588de0b3f4c1aa7ec0d17716fda9d874836ed68775c1/MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl" + "hash": "7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf", + "url": "https://files.pythonhosted.org/packages/0f/31/780bb297db036ba7b7bbede5e1d7f1e14d704ad4beb3ce53fb495d22bc62/MarkupSafe-2.1.5-cp39-cp39-macosx_10_9_universal2.whl" }, { "algorithm": "sha256", - "hash": "53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8", - "url": "https://files.pythonhosted.org/packages/66/66/b5891704372c9f5d97432933bdd7e9b5a0647fad9170c72bb7f486550c43/MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl" + "hash": "ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68", + "url": "https://files.pythonhosted.org/packages/4c/6f/f2b0f675635b05f6afd5ea03c094557bdb8622fa8e673387444fe8d8e787/MarkupSafe-2.1.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" }, { "algorithm": "sha256", - "hash": "37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac", - "url": "https://files.pythonhosted.org/packages/67/e9/579a3ad8d48f7680f887ff1f22cc6330f083de23ce32a8fa35f8acef477a/MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl" + "hash": "97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46", + "url": "https://files.pythonhosted.org/packages/4f/14/6f294b9c4f969d0c801a4615e221c1e084722ea6114ab2114189c5b8cbe0/MarkupSafe-2.1.5-cp38-cp38-macosx_10_9_x86_64.whl" }, { "algorithm": "sha256", - "hash": "47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75", - "url": "https://files.pythonhosted.org/packages/68/ba/7a5ca0f9b4239e6fd846dd54c0b5928187355fa62fbdbd13e1c5942afae7/MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl" + "hash": "5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0", + "url": "https://files.pythonhosted.org/packages/51/e0/393467cf899b34a9d3678e78961c2c8cdf49fb902a959ba54ece01273fb1/MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_aarch64.whl" }, { "algorithm": "sha256", - "hash": "ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902", - "url": "https://files.pythonhosted.org/packages/6f/83/eabfb8c6d60b096dc9ada378cf935809289c4d0327b74a60789bde77e1db/MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl" + "hash": "17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3", + "url": "https://files.pythonhosted.org/packages/5f/5a/360da85076688755ea0cceb92472923086993e86b5613bbae9fbc14136b0/MarkupSafe-2.1.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066", - "url": "https://files.pythonhosted.org/packages/70/56/f81c0cfbc22882df36358ecdedc5474571183e5a5adde1e237079acee437/MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl" + "hash": "4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465", + "url": "https://files.pythonhosted.org/packages/6a/18/ae5a258e3401f9b8312f92b028c54d7026a97ec3ab20bfaddbdfa7d8cce8/MarkupSafe-2.1.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" }, { "algorithm": "sha256", - "hash": "3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6", - "url": "https://files.pythonhosted.org/packages/7a/e8/00c435416c9b0238dca6f883563b01c4cc532b2ba6aaf7268081f6238520/MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl" + "hash": "db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2", + "url": "https://files.pythonhosted.org/packages/6c/77/d77701bbef72892affe060cdacb7a2ed7fd68dae3b477a8642f15ad3b132/MarkupSafe-2.1.5-cp39-cp39-macosx_10_9_x86_64.whl" }, { "algorithm": "sha256", - "hash": "4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047", - "url": "https://files.pythonhosted.org/packages/8f/87/4668ce3963e942a9aa7b13212158e74bf063a2461138b7ed5a043ac6aa79/MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl" + "hash": "1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532", + "url": "https://files.pythonhosted.org/packages/81/d4/fd74714ed30a1dedd0b82427c02fa4deec64f173831ec716da11c51a50aa/MarkupSafe-2.1.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" }, { "algorithm": "sha256", - "hash": "01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298", - "url": "https://files.pythonhosted.org/packages/92/ac/94771b65ac9f77cf37e43b38516697bbc4e128ee152b68d596ae44c6c896/MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl" + "hash": "d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b", + "url": "https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz" }, { "algorithm": "sha256", - "hash": "aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f", - "url": "https://files.pythonhosted.org/packages/95/18/b7a45c16635acafdf6837a6fd4c71acfe5bad202884c6fcbae4ea0763dde/MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl" + "hash": "fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab", + "url": "https://files.pythonhosted.org/packages/c7/bd/50319665ce81bb10e90d1cf76f9e1aa269ea6f7fa30ab4521f14d122a3df/MarkupSafe-2.1.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1", - "url": "https://files.pythonhosted.org/packages/a6/d1/a7b97d0e000336c4e06bfce7e08dcb2b47fc5091146ee883dfac6cb4842e/MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "hash": "bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea", + "url": "https://files.pythonhosted.org/packages/d1/06/a41c112ab9ffdeeb5f77bc3e331fdadf97fa65e52e44ba31880f4e7f983c/MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_i686.whl" }, { "algorithm": "sha256", - "hash": "9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e", - "url": "https://files.pythonhosted.org/packages/a7/55/a576835b6b95af21d15f69eaf14c4fb1358fd48475f2b9813abd9654132e/MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl" + "hash": "3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8", + "url": "https://files.pythonhosted.org/packages/d9/a7/1e558b4f78454c8a3a0199292d96159eb4d091f983bc35ef258314fe7269/MarkupSafe-2.1.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" }, { "algorithm": "sha256", - "hash": "f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509", - "url": "https://files.pythonhosted.org/packages/ae/70/8dd5f2c0aab82431c9c619a2c4fbd1742fc0fb769d8d7b275ae1d03eb3a5/MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl" + "hash": "30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4", + "url": "https://files.pythonhosted.org/packages/f6/02/5437e2ad33047290dafced9df741d9efc3e716b75583bbd73a9984f1b6f7/MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_i686.whl" }, { "algorithm": "sha256", - "hash": "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a", - "url": "https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e/MarkupSafe-2.0.1.tar.gz" - }, - { - "algorithm": "sha256", - "hash": "1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6", - "url": "https://files.pythonhosted.org/packages/c2/db/314df69668f582d5173922bded7b58126044bb77cfce6347c5d992074d2e/MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a", - "url": "https://files.pythonhosted.org/packages/cc/f2/854d33eee85df681e61e22b52d8e83bef8b7425c0b9826212289f7885710/MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl" - }, - { - "algorithm": "sha256", - "hash": "3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7", - "url": "https://files.pythonhosted.org/packages/ce/a7/835a636047f4bb4fea31a682c18affad9795e864d800892bd7248485425e/MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26", - "url": "https://files.pythonhosted.org/packages/dd/8f/d0c570c851f70377ca6f344531fab4b6b01a99a9d2a801b25d6fd75525e5/MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl" - }, - { - "algorithm": "sha256", - "hash": "6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b", - "url": "https://files.pythonhosted.org/packages/e4/9b/c7b55a2f587368d69eb6dc36e285010ab0bbb74323833d501921e08e2728/MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - }, - { - "algorithm": "sha256", - "hash": "97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb", - "url": "https://files.pythonhosted.org/packages/eb/3b/1cddaf0338a031ef5c2e1d9d74f2d607d564748a933b44de6edfe7a2a880/MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl" - }, - { - "algorithm": "sha256", - "hash": "1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35", - "url": "https://files.pythonhosted.org/packages/f9/12/b63afcb3bf9f27fd347adef452f9a6e27dfe7107a8f2685afacc8e9c6592/MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl" + "hash": "656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a", + "url": "https://files.pythonhosted.org/packages/f8/ff/2c942a82c35a49df5de3a630ce0a8456ac2969691b230e530ac12314364c/MarkupSafe-2.1.5-cp38-cp38-macosx_10_9_universal2.whl" } ], "project_name": "markupsafe", "requires_dists": [], - "requires_python": ">=3.6", - "version": "2.0.1" + "requires_python": ">=3.7", + "version": "2.1.5" }, { "artifacts": [ @@ -4813,21 +4778,22 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "72a4b735692dd3135217911cbeaa1be5fa3f62bffb8745c5215420a03dc55255", - "url": "https://files.pythonhosted.org/packages/c4/44/f50f2d22cdfb6d56c03d1b4cc3cfa03ebee2f21b59a7768f151e43415ba5/Werkzeug-2.1.2-py3-none-any.whl" + "hash": "02c9eb92b7d6c06f31a782811505d2157837cea66aaede3e217c7c27c039476c", + "url": "https://files.pythonhosted.org/packages/4b/84/997bbf7c2bf2dc3f09565c6d0b4959fefe5355c18c4096cfd26d83e0785b/werkzeug-3.0.4-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "1ce08e8093ed67d638d63879fd1ba3735817f7a80de3674d293f5984f25fb6e6", - "url": "https://files.pythonhosted.org/packages/10/cf/97eb1a3847c01ae53e8376bc21145555ac95279523a935963dc8ff96c50b/Werkzeug-2.1.2.tar.gz" + "hash": "34f2371506b250df4d4f84bfe7b0921e4762525762bbd936614909fe25cd7306", + "url": "https://files.pythonhosted.org/packages/0f/e2/6dbcaab07560909ff8f654d3a2e5a60552d937c909455211b1b36d7101dc/werkzeug-3.0.4.tar.gz" } ], "project_name": "werkzeug", "requires_dists": [ - "watchdog; extra == \"watchdog\"" + "MarkupSafe>=2.1.1", + "watchdog>=2.3; extra == \"watchdog\"" ], - "requires_python": ">=3.7", - "version": "2.1.2" + "requires_python": ">=3.8", + "version": "3.0.4" }, { "artifacts": [ diff --git a/requirements.txt b/requirements.txt index a1fa4ca620..479a970a5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ # If you want to update depdencies for a single component, modify the # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt -MarkupSafe==2.0.1 RandomWords amqp==5.2.0 apscheduler==3.10.4 diff --git a/st2actions/in-requirements.txt b/st2actions/in-requirements.txt index 14cda20b57..59ae7de83d 100644 --- a/st2actions/in-requirements.txt +++ b/st2actions/in-requirements.txt @@ -4,8 +4,6 @@ python-dateutil eventlet jinja2 kombu -#Used by jinja2 -MarkupSafe oslo.config oslo.utils pyparsing diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index 31f91031fd..71c1001f97 100644 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -5,7 +5,6 @@ # If you want to update depdencies for a single component, modify the # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt -MarkupSafe==2.0.1 apscheduler==3.10.4 chardet==5.2.0 eventlet==0.37.0 diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt index fb18210b1b..ab5340124c 100644 --- a/st2common/in-requirements.txt +++ b/st2common/in-requirements.txt @@ -8,8 +8,6 @@ greenlet jinja2 jsonschema kombu -#Used by jinja2 -MarkupSafe mongoengine networkx # used by networkx diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 63fff0d3db..a4547ffe7a 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -5,7 +5,6 @@ # If you want to update depdencies for a single component, modify the # in-requirements.txt for that component and then run 'make requirements' to # update the component requirements.txt -MarkupSafe==2.0.1 amqp==5.2.0 apscheduler==3.10.4 cffi==1.17.1 From 497179c01fd6ad0f8b554c3c18dc92ebddb26fb9 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 12:54:45 -0500 Subject: [PATCH 09/13] combine lockfiles/pytest.lock with lockfiles/st2.lock Lockfile diff: lockfiles/st2.lock [st2] == !! Downgraded dependencies !! == pytest 8.3.3 --> 7.0.1 == Added dependencies == coverage 7.4.4 execnet 2.1.1 icdiff 2.0.7 pprintpp 0.4.0 py 1.11.0 py-cpuinfo 9.0.0 pygal 3.0.5 pygaljs 1.0.2 pytest-benchmark 3.4.1 pytest-cov 3.0.0 pytest-forked 1.6.0 pytest-icdiff 0.9 pytest-xdist 2.5.0 == Removed dependencies == exceptiongroup 1.2.2 --- BUILD.tools | 2 +- lockfiles/pytest.lock | 685 ---------------------------------- lockfiles/st2-constraints.txt | 6 + lockfiles/st2.lock | 423 +++++++++++++++++++-- pants.toml | 4 +- requirements-pants.txt | 2 +- test-requirements.txt | 9 +- 7 files changed, 408 insertions(+), 723 deletions(-) delete mode 100644 lockfiles/pytest.lock diff --git a/BUILD.tools b/BUILD.tools index 8dee0061cf..af11c3db66 100644 --- a/BUILD.tools +++ b/BUILD.tools @@ -34,7 +34,7 @@ python_requirement( python_requirement( name="pytest-reqs", - resolve="pytest", + resolve="st2", requirements=[ "pytest==7.0.1", # copied from https://www.pantsbuild.org/v2.14/docs/reference-pytest#version "pytest-benchmark[histogram]==3.4.1", # used for st2common/benchmarks diff --git a/lockfiles/pytest.lock b/lockfiles/pytest.lock deleted file mode 100644 index 382ddf8b33..0000000000 --- a/lockfiles/pytest.lock +++ /dev/null @@ -1,685 +0,0 @@ -// This lockfile was autogenerated by Pants. To regenerate, run: -// -// pants generate-lockfiles --resolve=pytest -// -// --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE --- -// { -// "version": 3, -// "valid_for_interpreter_constraints": [ -// "CPython<3.10,>=3.8" -// ], -// "generated_with_requirements": [ -// "pygments", -// "pytest-benchmark[histogram]==3.4.1", -// "pytest-cov!=2.12.1,<3.1,>=2.12", -// "pytest-icdiff", -// "pytest-xdist<3,>=2.5", -// "pytest==7.0.1" -// ], -// "manylinux": "manylinux2014", -// "requirement_constraints": [], -// "only_binary": [], -// "no_binary": [] -// } -// --- END PANTS LOCKFILE METADATA --- - -{ - "allow_builds": true, - "allow_prereleases": false, - "allow_wheels": true, - "build_isolation": true, - "constraints": [], - "locked_resolves": [ - { - "locked_requirements": [ - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1", - "url": "https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30", - "url": "https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d/attrs-23.2.0.tar.gz" - } - ], - "project_name": "attrs", - "requires_dists": [ - "attrs[tests-mypy]; extra == \"tests-no-zope\"", - "attrs[tests-no-zope]; extra == \"tests\"", - "attrs[tests]; extra == \"cov\"", - "attrs[tests]; extra == \"dev\"", - "cloudpickle; platform_python_implementation == \"CPython\" and extra == \"tests-no-zope\"", - "coverage[toml]>=5.3; extra == \"cov\"", - "furo; extra == \"docs\"", - "hypothesis; extra == \"tests-no-zope\"", - "importlib-metadata; python_version < \"3.8\"", - "mypy>=1.6; (platform_python_implementation == \"CPython\" and python_version >= \"3.8\") and extra == \"tests-mypy\"", - "myst-parser; extra == \"docs\"", - "pre-commit; extra == \"dev\"", - "pympler; extra == \"tests-no-zope\"", - "pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.8\") and extra == \"tests-mypy\"", - "pytest-xdist[psutil]; extra == \"tests-no-zope\"", - "pytest>=4.3.0; extra == \"tests-no-zope\"", - "sphinx-notfound-page; extra == \"docs\"", - "sphinx; extra == \"docs\"", - "sphinxcontrib-towncrier; extra == \"docs\"", - "towncrier; extra == \"docs\"", - "zope-interface; extra == \"docs\"", - "zope-interface; extra == \"tests\"" - ], - "requires_python": ">=3.7", - "version": "23.2.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677", - "url": "https://files.pythonhosted.org/packages/99/15/dbcb5d0a22bf5357cf456dfd16f9ceb89c54544d6201d53bc77c75077a8e/coverage-7.4.4-pp38.pp39.pp310-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409", - "url": "https://files.pythonhosted.org/packages/0a/4f/0e04c34df68716b90bedf8b791c684d6a54cab92fbc9ca2c236a8ca268e6/coverage-7.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" - }, - { - "algorithm": "sha256", - "hash": "3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d", - "url": "https://files.pythonhosted.org/packages/1a/15/ae47f23bfd557364e731ad2ed182331ba72e8c063b806ba317cd327e73cc/coverage-7.4.4-cp39-cp39-macosx_10_9_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1", - "url": "https://files.pythonhosted.org/packages/23/7c/9863790fb889101c35018ecb9e241cb4f900a77ef100491bb043bfa5976c/coverage-7.4.4-cp38-cp38-macosx_11_0_arm64.whl" - }, - { - "algorithm": "sha256", - "hash": "8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a", - "url": "https://files.pythonhosted.org/packages/32/d4/60b1071c35bd3828590483ae0f8531f07b77d737e2c81dc51887c03bf890/coverage-7.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - }, - { - "algorithm": "sha256", - "hash": "742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade", - "url": "https://files.pythonhosted.org/packages/4d/39/0cfdb5a4bde5843eead02c0f8bc43f8ab3129408cbec53f9ad4f11fc27cf/coverage-7.4.4-cp39-cp39-musllinux_1_1_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4", - "url": "https://files.pythonhosted.org/packages/5b/ec/9bd500128995e9eec2ab50361ce8b853bab2b4839316ddcfd6a34f5bbfed/coverage-7.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c", - "url": "https://files.pythonhosted.org/packages/60/6b/7ac6da198b2c22fc6ba53e479cc800ec230bc7a40c14ed62358d7f1c809f/coverage-7.4.4-cp38-cp38-musllinux_1_1_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357", - "url": "https://files.pythonhosted.org/packages/64/09/91be1d04914deea7dd0e2f3e94d925c23e9b81ce23b0da014f1ff07dd772/coverage-7.4.4-cp39-cp39-macosx_11_0_arm64.whl" - }, - { - "algorithm": "sha256", - "hash": "d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384", - "url": "https://files.pythonhosted.org/packages/6f/ab/95a048c3acda69c9e4a40b3ae57f06c45b30c5d9401e6dc7246e9de83306/coverage-7.4.4-cp38-cp38-macosx_10_9_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e", - "url": "https://files.pythonhosted.org/packages/78/ab/39feda43fbd0ca46f695b36bfe1f6836efce9657e81889bb0dcc55fb1745/coverage-7.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" - }, - { - "algorithm": "sha256", - "hash": "c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd", - "url": "https://files.pythonhosted.org/packages/7c/a2/9302717d181eeaac738941b2a58e6bd776ef665db24f41f82e32cc8fe814/coverage-7.4.4-cp39-cp39-musllinux_1_1_i686.whl" - }, - { - "algorithm": "sha256", - "hash": "aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e", - "url": "https://files.pythonhosted.org/packages/8b/c7/54cde44ebed02848db20d67388d0f82db1b65eca09d48181df71fbd81cf5/coverage-7.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - }, - { - "algorithm": "sha256", - "hash": "a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e", - "url": "https://files.pythonhosted.org/packages/ad/6a/7eebb71ebdf5e56b6da69e5ca8f05b743e054ce9d4dfd440dbcb3f9be0f0/coverage-7.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - }, - { - "algorithm": "sha256", - "hash": "5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec", - "url": "https://files.pythonhosted.org/packages/ad/c6/385cf65448b5739881ba630d144e9c38464737ce68ae4fe4d6a2c7bb3809/coverage-7.4.4-cp39-cp39-musllinux_1_1_aarch64.whl" - }, - { - "algorithm": "sha256", - "hash": "38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7", - "url": "https://files.pythonhosted.org/packages/af/9c/bd573c65cf554b9979241c575916897e27107a70205b2fbe71218eaa24c4/coverage-7.4.4-cp38-cp38-musllinux_1_1_i686.whl" - }, - { - "algorithm": "sha256", - "hash": "c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49", - "url": "https://files.pythonhosted.org/packages/bf/d5/f809d8b630cf4c11fe490e20037a343d12a74ec2783c6cdb5aee725e7137/coverage-7.4.4.tar.gz" - }, - { - "algorithm": "sha256", - "hash": "ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd", - "url": "https://files.pythonhosted.org/packages/dc/8e/6df9cfab2eb2c5d8e634a18ade3451b587fd75a434366982bdcbefc125e6/coverage-7.4.4-cp38-cp38-musllinux_1_1_aarch64.whl" - } - ], - "project_name": "coverage", - "requires_dists": [ - "tomli; python_full_version <= \"3.11.0a6\" and extra == \"toml\"" - ], - "requires_python": ">=3.8", - "version": "7.4.4" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41", - "url": "https://files.pythonhosted.org/packages/e8/9c/a079946da30fac4924d92dbc617e5367d454954494cf1e71567bcc4e00ee/execnet-2.0.2-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af", - "url": "https://files.pythonhosted.org/packages/e4/c8/d382dc7a1e68a165f4a4ab612a08b20d8534a7d20cc590630b734ca0c54b/execnet-2.0.2.tar.gz" - } - ], - "project_name": "execnet", - "requires_dists": [ - "hatch; extra == \"testing\"", - "pre-commit; extra == \"testing\"", - "pytest; extra == \"testing\"", - "tox; extra == \"testing\"" - ], - "requires_python": ">=3.7", - "version": "2.0.2" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "f05d1b3623223dd1c70f7848da7d699de3d9a2550b902a8234d9026292fb5762", - "url": "https://files.pythonhosted.org/packages/7c/2a/b3178baa75a3ec75a33588252296c82a1332d2b83cd01061539b74bde9dd/icdiff-2.0.7-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "f79a318891adbf59a45e3a7694f5e1f18c5407065264637072ac8363b759866f", - "url": "https://files.pythonhosted.org/packages/fa/e4/43341832be5f2bcae71eb3ef08a07aaef9b74f74fe0b3675f62bd12057fe/icdiff-2.0.7.tar.gz" - } - ], - "project_name": "icdiff", - "requires_dists": [], - "requires_python": null, - "version": "2.0.7" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570", - "url": "https://files.pythonhosted.org/packages/2d/0a/679461c511447ffaf176567d5c496d1de27cbe34a87df6677d7171b2fbd4/importlib_metadata-7.1.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2", - "url": "https://files.pythonhosted.org/packages/a0/fc/c4e6078d21fc4fa56300a241b87eae76766aa380a23fc450fc85bb7bf547/importlib_metadata-7.1.0.tar.gz" - } - ], - "project_name": "importlib-metadata", - "requires_dists": [ - "flufl.flake8; extra == \"testing\"", - "furo; extra == \"docs\"", - "importlib-resources>=1.3; python_version < \"3.9\" and extra == \"testing\"", - "ipython; extra == \"perf\"", - "jaraco.packaging>=9.3; extra == \"docs\"", - "jaraco.test>=5.4; extra == \"testing\"", - "jaraco.tidelift>=1.4; extra == \"docs\"", - "packaging; extra == \"testing\"", - "pyfakefs; extra == \"testing\"", - "pytest-checkdocs>=2.4; extra == \"testing\"", - "pytest-cov; extra == \"testing\"", - "pytest-enabler>=2.2; extra == \"testing\"", - "pytest-mypy; platform_python_implementation != \"PyPy\" and extra == \"testing\"", - "pytest-perf>=0.9.2; extra == \"testing\"", - "pytest-ruff>=0.2.1; extra == \"testing\"", - "pytest>=6; extra == \"testing\"", - "rst.linker>=1.9; extra == \"docs\"", - "sphinx-lint; extra == \"docs\"", - "sphinx>=3.5; extra == \"docs\"", - "typing-extensions>=3.6.4; python_version < \"3.8\"", - "zipp>=0.5" - ], - "requires_python": ">=3.8", - "version": "7.1.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374", - "url": "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", - "url": "https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913/iniconfig-2.0.0.tar.gz" - } - ], - "project_name": "iniconfig", - "requires_dists": [], - "requires_python": ">=3.7", - "version": "2.0.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", - "url": "https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9", - "url": "https://files.pythonhosted.org/packages/ee/b5/b43a27ac7472e1818c4bafd44430e69605baefe1f34440593e0332ec8b4d/packaging-24.0.tar.gz" - } - ], - "project_name": "packaging", - "requires_dists": [], - "requires_python": ">=3.7", - "version": "24.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981", - "url": "https://files.pythonhosted.org/packages/a5/5b/0cc789b59e8cc1bf288b38111d002d8c5917123194d45b29dcdac64723cc/pluggy-1.4.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be", - "url": "https://files.pythonhosted.org/packages/54/c6/43f9d44d92aed815e781ca25ba8c174257e27253a94630d21be8725a2b59/pluggy-1.4.0.tar.gz" - } - ], - "project_name": "pluggy", - "requires_dists": [ - "pre-commit; extra == \"dev\"", - "pytest-benchmark; extra == \"testing\"", - "pytest; extra == \"testing\"", - "tox; extra == \"dev\"" - ], - "requires_python": ">=3.8", - "version": "1.4.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d", - "url": "https://files.pythonhosted.org/packages/4e/d1/e4ed95fdd3ef13b78630280d9e9e240aeb65cc7c544ec57106149c3942fb/pprintpp-0.4.0-py2.py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403", - "url": "https://files.pythonhosted.org/packages/06/1a/7737e7a0774da3c3824d654993cf57adc915cb04660212f03406334d8c0b/pprintpp-0.4.0.tar.gz" - } - ], - "project_name": "pprintpp", - "requires_dists": [], - "requires_python": null, - "version": "0.4.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378", - "url": "https://files.pythonhosted.org/packages/f6/f0/10642828a8dfb741e5f3fbaac830550a518a775c7fff6f04a007259b0548/py-1.11.0-py2.py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719", - "url": "https://files.pythonhosted.org/packages/98/ff/fec109ceb715d2a6b4c4a85a61af3b40c723a961e8828319fbcb15b868dc/py-1.11.0.tar.gz" - } - ], - "project_name": "py", - "requires_dists": [], - "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7", - "version": "1.11.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "859625bc251f64e21f077d099d4162689c762b5d6a4c3c97553d56241c9674d5", - "url": "https://files.pythonhosted.org/packages/e0/a9/023730ba63db1e494a271cb018dcd361bd2c917ba7004c3e49d5daf795a2/py_cpuinfo-9.0.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690", - "url": "https://files.pythonhosted.org/packages/37/a8/d832f7293ebb21690860d2e01d8115e5ff6f2ae8bbdc953f0eb0fa4bd2c7/py-cpuinfo-9.0.0.tar.gz" - } - ], - "project_name": "py-cpuinfo", - "requires_dists": [], - "requires_python": null, - "version": "9.0.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "e931caf08b4be0e6ec119a4c0e20dbed2d77829c641b7dea0ed21fe6ec81f2ea", - "url": "https://files.pythonhosted.org/packages/29/83/94e10cdc24489caef1ffcf9c3c2836fc35eff0f1c1d60d609d55d449820c/pygal-3.0.4-py2.py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "6c5da33f1041e8b30cbc980f8a34910d9edc584b833240298f6a25df65425289", - "url": "https://files.pythonhosted.org/packages/af/84/1ca8f53530c834c799e178c88d8f7f0694daa801e832e004aae79209e498/pygal-3.0.4.tar.gz" - } - ], - "project_name": "pygal", - "requires_dists": [ - "cairosvg; extra == \"png\"", - "cairosvg; extra == \"test\"", - "coveralls; extra == \"test\"", - "flake8; extra == \"test\"", - "flask; extra == \"test\"", - "importlib-metadata", - "lxml; extra == \"lxml\"", - "lxml; extra == \"test\"", - "pygal-maps-ch; extra == \"test\"", - "pygal-maps-fr; extra == \"test\"", - "pygal-maps-world; extra == \"test\"", - "pygal-sphinx-directives; extra == \"docs\"", - "pyquery; extra == \"test\"", - "pytest-cov; extra == \"test\"", - "pytest-isort; extra == \"test\"", - "pytest-runner; extra == \"test\"", - "pytest; extra == \"test\"", - "sphinx-rtd-theme; extra == \"docs\"", - "sphinx; extra == \"docs\"" - ], - "requires_python": ">=3.8", - "version": "3.0.4" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "d75e18cb21cc2cda40c45c3ee690771e5e3d4652bf57206f20137cf475c0dbe8", - "url": "https://files.pythonhosted.org/packages/49/6f/07dab31ca496feda35cf3455b9e9380c43b5c685bb54ad890831c790da38/pygaljs-1.0.2-py2.py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "0b71ee32495dcba5fbb4a0476ddbba07658ad65f5675e4ad409baf154dec5111", - "url": "https://files.pythonhosted.org/packages/75/19/3a53f34232a9e6ddad665e71c83693c5db9a31f71785105905c5bc9fbbba/pygaljs-1.0.2.tar.gz" - } - ], - "project_name": "pygaljs", - "requires_dists": [], - "requires_python": null, - "version": "1.0.2" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c", - "url": "https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367", - "url": "https://files.pythonhosted.org/packages/55/59/8bccf4157baf25e4aa5a0bb7fa3ba8600907de105ebc22b0c78cfbf6f565/pygments-2.17.2.tar.gz" - } - ], - "project_name": "pygments", - "requires_dists": [ - "colorama>=0.4.6; extra == \"windows-terminal\"", - "importlib-metadata; python_version < \"3.8\" and extra == \"plugins\"" - ], - "requires_python": ">=3.7", - "version": "2.17.2" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db", - "url": "https://files.pythonhosted.org/packages/38/93/c7c0bd1e932b287fb948eb9ce5a3d6307c9fc619db1e199f8c8bc5dad95f/pytest-7.0.1-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171", - "url": "https://files.pythonhosted.org/packages/3e/2c/a67ad48759051c7abf82ce182a4e6d766de371b183182d2dde03089e8dfb/pytest-7.0.1.tar.gz" - } - ], - "project_name": "pytest", - "requires_dists": [ - "argcomplete; extra == \"testing\"", - "atomicwrites>=1.0; sys_platform == \"win32\"", - "attrs>=19.2.0", - "colorama; sys_platform == \"win32\"", - "hypothesis>=3.56; extra == \"testing\"", - "importlib-metadata>=0.12; python_version < \"3.8\"", - "iniconfig", - "mock; extra == \"testing\"", - "nose; extra == \"testing\"", - "packaging", - "pluggy<2.0,>=0.12", - "py>=1.8.2", - "pygments>=2.7.2; extra == \"testing\"", - "requests; extra == \"testing\"", - "tomli>=1.0.0", - "xmlschema; extra == \"testing\"" - ], - "requires_python": ">=3.6", - "version": "7.0.1" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "36d2b08c4882f6f997fd3126a3d6dfd70f3249cde178ed8bbc0b73db7c20f809", - "url": "https://files.pythonhosted.org/packages/2c/60/423a63fb190a0483d049786a121bd3dfd7d93bb5ff1bb5b5cd13e5df99a7/pytest_benchmark-3.4.1-py2.py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "40e263f912de5a81d891619032983557d62a3d85843f9a9f30b98baea0cd7b47", - "url": "https://files.pythonhosted.org/packages/32/6a/bd6037a4e44b47085c8df9689921ca8d5669b3dbb0ecc3a77f8806cf67cc/pytest-benchmark-3.4.1.tar.gz" - } - ], - "project_name": "pytest-benchmark", - "requires_dists": [ - "aspectlib; extra == \"aspect\"", - "elasticsearch; extra == \"elasticsearch\"", - "pathlib2; python_version < \"3.4\"", - "py-cpuinfo", - "pygal; extra == \"histogram\"", - "pygaljs; extra == \"histogram\"", - "pytest>=3.8", - "statistics; python_version < \"3.4\"" - ], - "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7", - "version": "3.4.1" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6", - "url": "https://files.pythonhosted.org/packages/20/49/b3e0edec68d81846f519c602ac38af9db86e1e71275528b3e814ae236063/pytest_cov-3.0.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470", - "url": "https://files.pythonhosted.org/packages/61/41/e046526849972555928a6d31c2068410e47a31fb5ab0a77f868596811329/pytest-cov-3.0.0.tar.gz" - } - ], - "project_name": "pytest-cov", - "requires_dists": [ - "coverage[toml]>=5.2.1", - "fields; extra == \"testing\"", - "hunter; extra == \"testing\"", - "process-tests; extra == \"testing\"", - "pytest-xdist; extra == \"testing\"", - "pytest>=4.6", - "six; extra == \"testing\"", - "virtualenv; extra == \"testing\"" - ], - "requires_python": ">=3.6", - "version": "3.0.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "810958f66a91afb1a1e2ae83089d8dc1cd2437ac96b12963042fbb9fb4d16af0", - "url": "https://files.pythonhosted.org/packages/f4/af/9c0bda43e486a3c9bf1e0f876d0f241bc3f229d7d65d09331a0868db9629/pytest_forked-1.6.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f", - "url": "https://files.pythonhosted.org/packages/8c/c9/93ad2ba2413057ee694884b88cf7467a46c50c438977720aeac26e73fdb7/pytest-forked-1.6.0.tar.gz" - } - ], - "project_name": "pytest-forked", - "requires_dists": [ - "py", - "pytest>=3.10" - ], - "requires_python": ">=3.7", - "version": "1.6.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "efee0da3bd1b24ef2d923751c5c547fbb8df0a46795553fba08ef57c3ca03d82", - "url": "https://files.pythonhosted.org/packages/e2/e1/cafe1edf7a30be6fa1bbbf43f7af12b34682eadcf19eb6e9f7352062c422/pytest_icdiff-0.9-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "13aede616202e57fcc882568b64589002ef85438046f012ac30a8d959dac8b75", - "url": "https://files.pythonhosted.org/packages/5a/0c/66e1e2590e98f4428e374a3b6448dc086a908d15b1e24b914539d13b7ac4/pytest-icdiff-0.9.tar.gz" - } - ], - "project_name": "pytest-icdiff", - "requires_dists": [ - "icdiff", - "pprintpp", - "pytest" - ], - "requires_python": ">=3.7", - "version": "0.9" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65", - "url": "https://files.pythonhosted.org/packages/21/08/b1945d4b4986eb1aa10cf84efc5293bba39da80a2f95db3573dd90678408/pytest_xdist-2.5.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf", - "url": "https://files.pythonhosted.org/packages/5d/43/9dbc32d297d6eae85d6c05dc8e8d3371061bd6cbe56a2f645d9ea4b53d9b/pytest-xdist-2.5.0.tar.gz" - } - ], - "project_name": "pytest-xdist", - "requires_dists": [ - "execnet>=1.1", - "filelock; extra == \"testing\"", - "psutil>=3.0; extra == \"psutil\"", - "pytest-forked", - "pytest>=6.2.0", - "setproctitle; extra == \"setproctitle\"" - ], - "requires_python": ">=3.6", - "version": "2.5.0" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f", - "url": "https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3/tomli-2.0.1.tar.gz" - } - ], - "project_name": "tomli", - "requires_dists": [], - "requires_python": ">=3.7", - "version": "2.0.1" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b", - "url": "https://files.pythonhosted.org/packages/c2/0a/ba9d0ee9536d3ef73a3448e931776e658b36f128d344e175bc32b092a8bf/zipp-3.18.1-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715", - "url": "https://files.pythonhosted.org/packages/3e/ef/65da662da6f9991e87f058bc90b91a935ae655a16ae5514660d6460d1298/zipp-3.18.1.tar.gz" - } - ], - "project_name": "zipp", - "requires_dists": [ - "big-O; extra == \"testing\"", - "furo; extra == \"docs\"", - "jaraco.functools; extra == \"testing\"", - "jaraco.itertools; extra == \"testing\"", - "jaraco.packaging>=9.3; extra == \"docs\"", - "jaraco.tidelift>=1.4; extra == \"docs\"", - "more-itertools; extra == \"testing\"", - "pytest-checkdocs>=2.4; extra == \"testing\"", - "pytest-cov; extra == \"testing\"", - "pytest-enabler>=2.2; extra == \"testing\"", - "pytest-ignore-flaky; extra == \"testing\"", - "pytest-mypy; platform_python_implementation != \"PyPy\" and extra == \"testing\"", - "pytest-ruff>=0.2.1; extra == \"testing\"", - "pytest>=6; extra == \"testing\"", - "rst.linker>=1.9; extra == \"docs\"", - "sphinx-lint; extra == \"docs\"", - "sphinx>=3.5; extra == \"docs\"" - ], - "requires_python": ">=3.8", - "version": "3.18.1" - } - ], - "platform_tag": null - } - ], - "path_mappings": {}, - "pex_version": "2.1.137", - "pip_version": "23.1.2", - "prefer_older_binary": false, - "requirements": [ - "pygments", - "pytest-benchmark[histogram]==3.4.1", - "pytest-cov!=2.12.1,<3.1,>=2.12", - "pytest-icdiff", - "pytest-xdist<3,>=2.5", - "pytest==7.0.1" - ], - "requires_python": [ - "<3.10,>=3.8" - ], - "resolver_version": "pip-2020-resolver", - "style": "universal", - "target_systems": [ - "linux", - "mac" - ], - "transitive": true, - "use_pep517": null -} diff --git a/lockfiles/st2-constraints.txt b/lockfiles/st2-constraints.txt index 24d85a0a37..7a14984e80 100644 --- a/lockfiles/st2-constraints.txt +++ b/lockfiles/st2-constraints.txt @@ -12,6 +12,12 @@ # DROPS RESOLVED VERSION: # +# REQUIRED BY: pytest-cov +# REASON: 7.5 was causing errors with orquesta integration tests +# NOTE: This was probably interaction w/ nose. Try to remove this after switch to pytest. +# DROPS RESOLVED VERSION: 7.6.1 +coverage<7.5 + # ############################################ # # pinned transitive deps from requirements.txt # # ############################################ # diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock index 9e25eb11aa..ba96a5f8c9 100644 --- a/lockfiles/st2.lock +++ b/lockfiles/st2.lock @@ -54,7 +54,11 @@ // "pymongo<4.7,>=4.0.0", // "pyrabbit", // "pysocks", -// "pytest", +// "pytest-benchmark[histogram]==3.4.1", +// "pytest-cov!=2.12.1,<3.1,>=2.12", +// "pytest-icdiff", +// "pytest-xdist<3,>=2.5", +// "pytest==7.0.1", // "python-dateutil", // "python-json-logger", // "python-statsd", @@ -86,7 +90,9 @@ // "zstandard" // ], // "manylinux": "manylinux2014", -// "requirement_constraints": [], +// "requirement_constraints": [ +// "coverage<7.5" +// ], // "only_binary": [], // "no_binary": [] // } @@ -97,7 +103,9 @@ "allow_prereleases": false, "allow_wheels": true, "build_isolation": true, - "constraints": [], + "constraints": [ + "coverage<7.5" + ], "excluded": [], "locked_resolves": [ { @@ -890,6 +898,106 @@ "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7", "version": "0.4.6" }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677", + "url": "https://files.pythonhosted.org/packages/99/15/dbcb5d0a22bf5357cf456dfd16f9ceb89c54544d6201d53bc77c75077a8e/coverage-7.4.4-pp38.pp39.pp310-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409", + "url": "https://files.pythonhosted.org/packages/0a/4f/0e04c34df68716b90bedf8b791c684d6a54cab92fbc9ca2c236a8ca268e6/coverage-7.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" + }, + { + "algorithm": "sha256", + "hash": "3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d", + "url": "https://files.pythonhosted.org/packages/1a/15/ae47f23bfd557364e731ad2ed182331ba72e8c063b806ba317cd327e73cc/coverage-7.4.4-cp39-cp39-macosx_10_9_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1", + "url": "https://files.pythonhosted.org/packages/23/7c/9863790fb889101c35018ecb9e241cb4f900a77ef100491bb043bfa5976c/coverage-7.4.4-cp38-cp38-macosx_11_0_arm64.whl" + }, + { + "algorithm": "sha256", + "hash": "8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a", + "url": "https://files.pythonhosted.org/packages/32/d4/60b1071c35bd3828590483ae0f8531f07b77d737e2c81dc51887c03bf890/coverage-7.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + }, + { + "algorithm": "sha256", + "hash": "742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade", + "url": "https://files.pythonhosted.org/packages/4d/39/0cfdb5a4bde5843eead02c0f8bc43f8ab3129408cbec53f9ad4f11fc27cf/coverage-7.4.4-cp39-cp39-musllinux_1_1_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4", + "url": "https://files.pythonhosted.org/packages/5b/ec/9bd500128995e9eec2ab50361ce8b853bab2b4839316ddcfd6a34f5bbfed/coverage-7.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c", + "url": "https://files.pythonhosted.org/packages/60/6b/7ac6da198b2c22fc6ba53e479cc800ec230bc7a40c14ed62358d7f1c809f/coverage-7.4.4-cp38-cp38-musllinux_1_1_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357", + "url": "https://files.pythonhosted.org/packages/64/09/91be1d04914deea7dd0e2f3e94d925c23e9b81ce23b0da014f1ff07dd772/coverage-7.4.4-cp39-cp39-macosx_11_0_arm64.whl" + }, + { + "algorithm": "sha256", + "hash": "d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384", + "url": "https://files.pythonhosted.org/packages/6f/ab/95a048c3acda69c9e4a40b3ae57f06c45b30c5d9401e6dc7246e9de83306/coverage-7.4.4-cp38-cp38-macosx_10_9_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e", + "url": "https://files.pythonhosted.org/packages/78/ab/39feda43fbd0ca46f695b36bfe1f6836efce9657e81889bb0dcc55fb1745/coverage-7.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" + }, + { + "algorithm": "sha256", + "hash": "c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd", + "url": "https://files.pythonhosted.org/packages/7c/a2/9302717d181eeaac738941b2a58e6bd776ef665db24f41f82e32cc8fe814/coverage-7.4.4-cp39-cp39-musllinux_1_1_i686.whl" + }, + { + "algorithm": "sha256", + "hash": "aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e", + "url": "https://files.pythonhosted.org/packages/8b/c7/54cde44ebed02848db20d67388d0f82db1b65eca09d48181df71fbd81cf5/coverage-7.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + }, + { + "algorithm": "sha256", + "hash": "a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e", + "url": "https://files.pythonhosted.org/packages/ad/6a/7eebb71ebdf5e56b6da69e5ca8f05b743e054ce9d4dfd440dbcb3f9be0f0/coverage-7.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec", + "url": "https://files.pythonhosted.org/packages/ad/c6/385cf65448b5739881ba630d144e9c38464737ce68ae4fe4d6a2c7bb3809/coverage-7.4.4-cp39-cp39-musllinux_1_1_aarch64.whl" + }, + { + "algorithm": "sha256", + "hash": "38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7", + "url": "https://files.pythonhosted.org/packages/af/9c/bd573c65cf554b9979241c575916897e27107a70205b2fbe71218eaa24c4/coverage-7.4.4-cp38-cp38-musllinux_1_1_i686.whl" + }, + { + "algorithm": "sha256", + "hash": "c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49", + "url": "https://files.pythonhosted.org/packages/bf/d5/f809d8b630cf4c11fe490e20037a343d12a74ec2783c6cdb5aee725e7137/coverage-7.4.4.tar.gz" + }, + { + "algorithm": "sha256", + "hash": "ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd", + "url": "https://files.pythonhosted.org/packages/dc/8e/6df9cfab2eb2c5d8e634a18ade3451b587fd75a434366982bdcbefc125e6/coverage-7.4.4-cp38-cp38-musllinux_1_1_aarch64.whl" + } + ], + "project_name": "coverage", + "requires_dists": [ + "tomli; python_full_version <= \"3.11.0a6\" and extra == \"toml\"" + ], + "requires_python": ">=3.8", + "version": "7.4.4" + }, { "artifacts": [ { @@ -1157,21 +1265,24 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", - "url": "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl" + "hash": "26dee51f1b80cebd6d0ca8e74dd8745419761d3bef34163928cbebbdc4749fdc", + "url": "https://files.pythonhosted.org/packages/43/09/2aea36ff60d16dd8879bdb2f5b3ee0ba8d08cbbdcdfe870e695ce3784385/execnet-2.1.1-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc", - "url": "https://files.pythonhosted.org/packages/09/35/2495c4ac46b980e4ca1f6ad6db102322ef3ad2410b79fdde159a4b0f3b92/exceptiongroup-1.2.2.tar.gz" + "hash": "5189b52c6121c24feae288166ab41b32549c7e2348652736540b9e6e7d4e72e3", + "url": "https://files.pythonhosted.org/packages/bb/ff/b4c0dc78fbe20c3e59c0c7334de0c27eb4001a2b2017999af398bf730817/execnet-2.1.1.tar.gz" } ], - "project_name": "exceptiongroup", + "project_name": "execnet", "requires_dists": [ - "pytest>=6; extra == \"test\"" + "hatch; extra == \"testing\"", + "pre-commit; extra == \"testing\"", + "pytest; extra == \"testing\"", + "tox; extra == \"testing\"" ], - "requires_python": ">=3.7", - "version": "1.2.2" + "requires_python": ">=3.8", + "version": "2.1.1" }, { "artifacts": [ @@ -1530,6 +1641,24 @@ "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7", "version": "0.22.0" }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "f05d1b3623223dd1c70f7848da7d699de3d9a2550b902a8234d9026292fb5762", + "url": "https://files.pythonhosted.org/packages/7c/2a/b3178baa75a3ec75a33588252296c82a1332d2b83cd01061539b74bde9dd/icdiff-2.0.7-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "f79a318891adbf59a45e3a7694f5e1f18c5407065264637072ac8363b759866f", + "url": "https://files.pythonhosted.org/packages/fa/e4/43341832be5f2bcae71eb3ef08a07aaef9b74f74fe0b3675f62bd12057fe/icdiff-2.0.7.tar.gz" + } + ], + "project_name": "icdiff", + "requires_dists": [], + "requires_python": null, + "version": "2.0.7" + }, { "artifacts": [ { @@ -2705,6 +2834,24 @@ "requires_python": null, "version": "3.11" }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d", + "url": "https://files.pythonhosted.org/packages/4e/d1/e4ed95fdd3ef13b78630280d9e9e240aeb65cc7c544ec57106149c3942fb/pprintpp-0.4.0-py2.py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403", + "url": "https://files.pythonhosted.org/packages/06/1a/7737e7a0774da3c3824d654993cf57adc915cb04660212f03406334d8c0b/pprintpp-0.4.0.tar.gz" + } + ], + "project_name": "pprintpp", + "requires_dists": [], + "requires_python": null, + "version": "0.4.0" + }, { "artifacts": [ { @@ -2842,6 +2989,42 @@ "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7", "version": "6.1.0" }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378", + "url": "https://files.pythonhosted.org/packages/f6/f0/10642828a8dfb741e5f3fbaac830550a518a775c7fff6f04a007259b0548/py-1.11.0-py2.py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719", + "url": "https://files.pythonhosted.org/packages/98/ff/fec109ceb715d2a6b4c4a85a61af3b40c723a961e8828319fbcb15b868dc/py-1.11.0.tar.gz" + } + ], + "project_name": "py", + "requires_dists": [], + "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7", + "version": "1.11.0" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "859625bc251f64e21f077d099d4162689c762b5d6a4c3c97553d56241c9674d5", + "url": "https://files.pythonhosted.org/packages/e0/a9/023730ba63db1e494a271cb018dcd361bd2c917ba7004c3e49d5daf795a2/py_cpuinfo-9.0.0-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690", + "url": "https://files.pythonhosted.org/packages/37/a8/d832f7293ebb21690860d2e01d8115e5ff6f2ae8bbdc953f0eb0fa4bd2c7/py-cpuinfo-9.0.0.tar.gz" + } + ], + "project_name": "py-cpuinfo", + "requires_dists": [], + "requires_python": null, + "version": "9.0.0" + }, { "artifacts": [ { @@ -2898,6 +3081,60 @@ "requires_python": ">=3.8", "version": "2.22" }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "a3268a5667b470c8fbbb0eca7e987561a7321caeba589d40e4c1bc16dbe71393", + "url": "https://files.pythonhosted.org/packages/22/7d/b5d656dbeb73f488ce7409a75108a775f6cf8e20624ed8025a9476cbc1bb/pygal-3.0.5-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "c0a0f34e5bc1c01975c2bfb8342ad521e293ad42e525699dd00c4d7a52c14b71", + "url": "https://files.pythonhosted.org/packages/49/7b/8f50821a0f1585881ef40ae13ecb7603b0d81ef99fedf992ec35e6b6f7d5/pygal-3.0.5.tar.gz" + } + ], + "project_name": "pygal", + "requires_dists": [ + "cairosvg; extra == \"png\"", + "cairosvg; extra == \"test\"", + "coveralls; extra == \"test\"", + "flask; extra == \"moulinrouge\"", + "importlib-metadata", + "lxml; extra == \"lxml\"", + "lxml; extra == \"test\"", + "pygal-maps-ch; extra == \"moulinrouge\"", + "pygal-maps-fr; extra == \"moulinrouge\"", + "pygal-maps-world; extra == \"moulinrouge\"", + "pygal-sphinx-directives; extra == \"docs\"", + "pyquery; extra == \"test\"", + "pytest-cov; extra == \"test\"", + "pytest; extra == \"test\"", + "ruff>=0.5.6; extra == \"test\"", + "sphinx-rtd-theme; extra == \"docs\"", + "sphinx; extra == \"docs\"" + ], + "requires_python": ">=3.8", + "version": "3.0.5" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "d75e18cb21cc2cda40c45c3ee690771e5e3d4652bf57206f20137cf475c0dbe8", + "url": "https://files.pythonhosted.org/packages/49/6f/07dab31ca496feda35cf3455b9e9380c43b5c685bb54ad890831c790da38/pygaljs-1.0.2-py2.py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "0b71ee32495dcba5fbb4a0476ddbba07658ad65f5675e4ad409baf154dec5111", + "url": "https://files.pythonhosted.org/packages/75/19/3a53f34232a9e6ddad665e71c83693c5db9a31f71785105905c5bc9fbbba/pygaljs-1.0.2.tar.gz" + } + ], + "project_name": "pygaljs", + "requires_dists": [], + "requires_python": null, + "version": "1.0.2" + }, { "artifacts": [ { @@ -3304,34 +3541,158 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2", - "url": "https://files.pythonhosted.org/packages/6b/77/7440a06a8ead44c7757a64362dd22df5760f9b12dc5f11b6188cd2fc27a0/pytest-8.3.3-py3-none-any.whl" + "hash": "9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db", + "url": "https://files.pythonhosted.org/packages/38/93/c7c0bd1e932b287fb948eb9ce5a3d6307c9fc619db1e199f8c8bc5dad95f/pytest-7.0.1-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181", - "url": "https://files.pythonhosted.org/packages/8b/6c/62bbd536103af674e227c41a8f3dcd022d591f6eed5facb5a0f31ee33bbc/pytest-8.3.3.tar.gz" + "hash": "e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171", + "url": "https://files.pythonhosted.org/packages/3e/2c/a67ad48759051c7abf82ce182a4e6d766de371b183182d2dde03089e8dfb/pytest-7.0.1.tar.gz" } ], "project_name": "pytest", "requires_dists": [ - "argcomplete; extra == \"dev\"", - "attrs>=19.2; extra == \"dev\"", + "argcomplete; extra == \"testing\"", + "atomicwrites>=1.0; sys_platform == \"win32\"", + "attrs>=19.2.0", "colorama; sys_platform == \"win32\"", - "exceptiongroup>=1.0.0rc8; python_version < \"3.11\"", - "hypothesis>=3.56; extra == \"dev\"", + "hypothesis>=3.56; extra == \"testing\"", + "importlib-metadata>=0.12; python_version < \"3.8\"", "iniconfig", - "mock; extra == \"dev\"", + "mock; extra == \"testing\"", + "nose; extra == \"testing\"", "packaging", - "pluggy<2,>=1.5", - "pygments>=2.7.2; extra == \"dev\"", - "requests; extra == \"dev\"", - "setuptools; extra == \"dev\"", - "tomli>=1; python_version < \"3.11\"", - "xmlschema; extra == \"dev\"" + "pluggy<2.0,>=0.12", + "py>=1.8.2", + "pygments>=2.7.2; extra == \"testing\"", + "requests; extra == \"testing\"", + "tomli>=1.0.0", + "xmlschema; extra == \"testing\"" ], - "requires_python": ">=3.8", - "version": "8.3.3" + "requires_python": ">=3.6", + "version": "7.0.1" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "36d2b08c4882f6f997fd3126a3d6dfd70f3249cde178ed8bbc0b73db7c20f809", + "url": "https://files.pythonhosted.org/packages/2c/60/423a63fb190a0483d049786a121bd3dfd7d93bb5ff1bb5b5cd13e5df99a7/pytest_benchmark-3.4.1-py2.py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "40e263f912de5a81d891619032983557d62a3d85843f9a9f30b98baea0cd7b47", + "url": "https://files.pythonhosted.org/packages/32/6a/bd6037a4e44b47085c8df9689921ca8d5669b3dbb0ecc3a77f8806cf67cc/pytest-benchmark-3.4.1.tar.gz" + } + ], + "project_name": "pytest-benchmark", + "requires_dists": [ + "aspectlib; extra == \"aspect\"", + "elasticsearch; extra == \"elasticsearch\"", + "pathlib2; python_version < \"3.4\"", + "py-cpuinfo", + "pygal; extra == \"histogram\"", + "pygaljs; extra == \"histogram\"", + "pytest>=3.8", + "statistics; python_version < \"3.4\"" + ], + "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7", + "version": "3.4.1" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6", + "url": "https://files.pythonhosted.org/packages/20/49/b3e0edec68d81846f519c602ac38af9db86e1e71275528b3e814ae236063/pytest_cov-3.0.0-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470", + "url": "https://files.pythonhosted.org/packages/61/41/e046526849972555928a6d31c2068410e47a31fb5ab0a77f868596811329/pytest-cov-3.0.0.tar.gz" + } + ], + "project_name": "pytest-cov", + "requires_dists": [ + "coverage[toml]>=5.2.1", + "fields; extra == \"testing\"", + "hunter; extra == \"testing\"", + "process-tests; extra == \"testing\"", + "pytest-xdist; extra == \"testing\"", + "pytest>=4.6", + "six; extra == \"testing\"", + "virtualenv; extra == \"testing\"" + ], + "requires_python": ">=3.6", + "version": "3.0.0" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "810958f66a91afb1a1e2ae83089d8dc1cd2437ac96b12963042fbb9fb4d16af0", + "url": "https://files.pythonhosted.org/packages/f4/af/9c0bda43e486a3c9bf1e0f876d0f241bc3f229d7d65d09331a0868db9629/pytest_forked-1.6.0-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f", + "url": "https://files.pythonhosted.org/packages/8c/c9/93ad2ba2413057ee694884b88cf7467a46c50c438977720aeac26e73fdb7/pytest-forked-1.6.0.tar.gz" + } + ], + "project_name": "pytest-forked", + "requires_dists": [ + "py", + "pytest>=3.10" + ], + "requires_python": ">=3.7", + "version": "1.6.0" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "efee0da3bd1b24ef2d923751c5c547fbb8df0a46795553fba08ef57c3ca03d82", + "url": "https://files.pythonhosted.org/packages/e2/e1/cafe1edf7a30be6fa1bbbf43f7af12b34682eadcf19eb6e9f7352062c422/pytest_icdiff-0.9-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "13aede616202e57fcc882568b64589002ef85438046f012ac30a8d959dac8b75", + "url": "https://files.pythonhosted.org/packages/5a/0c/66e1e2590e98f4428e374a3b6448dc086a908d15b1e24b914539d13b7ac4/pytest-icdiff-0.9.tar.gz" + } + ], + "project_name": "pytest-icdiff", + "requires_dists": [ + "icdiff", + "pprintpp", + "pytest" + ], + "requires_python": ">=3.7", + "version": "0.9" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65", + "url": "https://files.pythonhosted.org/packages/21/08/b1945d4b4986eb1aa10cf84efc5293bba39da80a2f95db3573dd90678408/pytest_xdist-2.5.0-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf", + "url": "https://files.pythonhosted.org/packages/5d/43/9dbc32d297d6eae85d6c05dc8e8d3371061bd6cbe56a2f645d9ea4b53d9b/pytest-xdist-2.5.0.tar.gz" + } + ], + "project_name": "pytest-xdist", + "requires_dists": [ + "execnet>=1.1", + "filelock; extra == \"testing\"", + "psutil>=3.0; extra == \"psutil\"", + "pytest-forked", + "pytest>=6.2.0", + "setproctitle; extra == \"setproctitle\"" + ], + "requires_python": ">=3.6", + "version": "2.5.0" }, { "artifacts": [ @@ -5244,7 +5605,11 @@ "pymongo<4.7,>=4.0.0", "pyrabbit", "pysocks", - "pytest", + "pytest-benchmark[histogram]==3.4.1", + "pytest-cov!=2.12.1,<3.1,>=2.12", + "pytest-icdiff", + "pytest-xdist<3,>=2.5", + "pytest==7.0.1", "python-dateutil", "python-json-logger", "python-statsd", diff --git a/pants.toml b/pants.toml index 8cccd1f2cd..fb6272b5b0 100644 --- a/pants.toml +++ b/pants.toml @@ -133,7 +133,6 @@ black = "lockfiles/black.lock" flake8 = "lockfiles/flake8.lock" pants-plugins = "lockfiles/pants-plugins.lock" # see //pants-plugins/BUILD pylint = "lockfiles/pylint.lock" # see //pylint_plugins/BUILD -pytest = "lockfiles/pytest.lock" twine = "lockfiles/twine.lock" [python.resolves_to_interpreter_constraints] @@ -142,7 +141,6 @@ black = ["%(tool_interpreter_constraints)s"] flake8 = ["%(flake8_interpreter_constraints)s"] pants-plugins = ["%(pants_plugins_interpreter_constraints)s"] pylint = ["%(tool_interpreter_constraints)s"] -pytest = ["%(tool_interpreter_constraints)s"] twine = ["%(tool_interpreter_constraints)s"] [python.resolves_to_constraints_file] @@ -225,7 +223,7 @@ args = [ ] [pytest] -install_from_resolve = "pytest" +install_from_resolve = "st2" args = [ "--no-header", # don't print pytest version for every tested file ] diff --git a/requirements-pants.txt b/requirements-pants.txt index f61f508ec6..21e3e48c02 100644 --- a/requirements-pants.txt +++ b/requirements-pants.txt @@ -53,7 +53,7 @@ pygments pymongo>=4.0.0,<4.7 # pyrabbit used in an integration test pyrabbit -pytest +# pytest reqs in BUILD.tools file python-dateutil # pythonjsonlogger referenced in st2actions/conf/logging.conf python-json-logger diff --git a/test-requirements.txt b/test-requirements.txt index 8e3aa9e889..b101e0b0fc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,7 @@ # - https://github.com/StackStorm/st2-auth-ldap # - https://github.com/StackStorm/st2-rbac-backend # ---------------------------------------------------------------------- -# 7.5 causing errors with orquesta integration tests (probably interaction w/ nose) -coverage<7.5 +coverage==7.4.4 pep8==1.7.1 flake8==7.0.0 st2flake8>0.1.0 @@ -44,9 +43,11 @@ pyrabbit prance==23.6.21.0 # pip-tools provides pip-compile: to check for version conflicts pip-tools==7.4.1 -pytest==6.2.3 -pytest-benchmark==3.4.1 +pytest==7.0.1 pytest-benchmark[histogram]==3.4.1 +pytest-icdiff==0.9 +pytest-cov==3.0.0 +pytest-xdist==2.5.0 # zstandard is used for micro benchmarks zstandard==0.23.0 # ujson is used for micro benchmarks From efc416690e022f9d20888a75d712665e8920f9bc Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 13:08:50 -0500 Subject: [PATCH 10/13] bump bandit deps to match pants default versions Lockfile diff: lockfiles/bandit.lock [bandit] == Upgraded dependencies == bandit 1.7.0 --> 1.7.10 gitpython 3.1.18 --> 3.1.43 pbr 6.0.0 --> 6.1.0 pyyaml 6.0.1 --> 6.0.2 setuptools 69.2.0 --> 75.2.0 stevedore 5.2.0 --> 5.3.0 == Added dependencies == markdown-it-py 3.0.0 mdurl 0.1.2 pygments 2.18.0 rich 13.9.3 typing-extensions 4.12.2 == Removed dependencies == six 1.16.0 --- BUILD.tools | 5 +- lockfiles/bandit.lock | 395 +++++++++++++++++++++++++++++------------- test-requirements.txt | 2 +- 3 files changed, 277 insertions(+), 125 deletions(-) diff --git a/BUILD.tools b/BUILD.tools index af11c3db66..21f71c1508 100644 --- a/BUILD.tools +++ b/BUILD.tools @@ -4,9 +4,10 @@ python_requirement( name="bandit-reqs", resolve="bandit", requirements=[ - "bandit==1.7.0", + # https://github.com/pantsbuild/pants/blob/release_2.23.0rc0/src/python/pants/backend/python/lint/bandit/subsystem.py#L44-L52 + "bandit>=1.7.0,<1.8", "setuptools", - "GitPython==3.1.18", + "GitPython>=3.1.24", ], ) diff --git a/lockfiles/bandit.lock b/lockfiles/bandit.lock index 956a06fda7..564e5fbbb1 100644 --- a/lockfiles/bandit.lock +++ b/lockfiles/bandit.lock @@ -9,8 +9,8 @@ // "CPython<3.10,>=3.8" // ], // "generated_with_requirements": [ -// "GitPython==3.1.18", -// "bandit==1.7.0", +// "GitPython>=3.1.24", +// "bandit<1.8,>=1.7.0", // "setuptools" // ], // "manylinux": "manylinux2014", @@ -26,6 +26,7 @@ "allow_wheels": true, "build_isolation": true, "constraints": [], + "excluded": [], "locked_resolves": [ { "locked_requirements": [ @@ -33,25 +34,37 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "216be4d044209fa06cf2a3e51b319769a51be8318140659719aa7a115c35ed07", - "url": "https://files.pythonhosted.org/packages/6e/68/dc39991eb6074cabeed2ee78f6e101054869f79ba806f8b6e4b1f4f7c3f6/bandit-1.7.0-py3-none-any.whl" + "hash": "665721d7bebbb4485a339c55161ac0eedde27d51e638000d91c8c2d68343ad02", + "url": "https://files.pythonhosted.org/packages/9e/9c/491231d973d54f6465002812b4cadc663f208436407745be473254725f55/bandit-1.7.10-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "8a4c7415254d75df8ff3c3b15cfe9042ecee628a1e40b44c15a98890fbfc2608", - "url": "https://files.pythonhosted.org/packages/6c/a1/14b70b67ea9c69e863dd65386bbc948ae34a502512d6f36e2a5a9fd5513b/bandit-1.7.0.tar.gz" + "hash": "59ed5caf5d92b6ada4bf65bc6437feea4a9da1093384445fed4d472acc6cff7b", + "url": "https://files.pythonhosted.org/packages/38/26/bdd962d6ee781f6229c3fb83483cf9e09d87959150a9000789806d750f3c/bandit-1.7.10.tar.gz" } ], "project_name": "bandit", "requires_dists": [ - "GitPython>=1.0.1", + "GitPython>=3.1.30; extra == \"baseline\"", + "PyYAML; extra == \"yaml\"", "PyYAML>=5.3.1", + "beautifulsoup4>=4.8.0; extra == \"test\"", "colorama>=0.3.9; platform_system == \"Windows\"", - "six>=1.10.0", - "stevedore>=1.20.0" + "coverage>=4.5.4; extra == \"test\"", + "fixtures>=3.0.0; extra == \"test\"", + "flake8>=4.0.0; extra == \"test\"", + "jschema-to-python>=1.2.3; extra == \"sarif\"", + "pylint==1.9.4; extra == \"test\"", + "rich", + "sarif-om>=1.0.4; extra == \"sarif\"", + "stestr>=2.5.0; extra == \"test\"", + "stevedore>=1.20.0", + "testscenarios>=0.5.0; extra == \"test\"", + "testtools>=2.3.0; extra == \"test\"", + "tomli>=1.1.0; python_version < \"3.11\" and extra == \"toml\"" ], - "requires_python": ">=3.5", - "version": "1.7.0" + "requires_python": ">=3.8", + "version": "1.7.10" }, { "artifacts": [ @@ -77,193 +90,310 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "fce760879cd2aebd2991b3542876dc5c4a909b30c9d69dfc488e504a8db37ee8", - "url": "https://files.pythonhosted.org/packages/bc/91/b38c4fabb6e5092ab23492ded4f318ab7299b19263272b703478038c0fbc/GitPython-3.1.18-py3-none-any.whl" + "hash": "eec7ec56b92aad751f9912a73404bc02ba212a23adb2c7098ee668417051a1ff", + "url": "https://files.pythonhosted.org/packages/e9/bd/cc3a402a6439c15c3d4294333e13042b915bbeab54edc457c723931fed3f/GitPython-3.1.43-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b", - "url": "https://files.pythonhosted.org/packages/29/22/3d591875078c1c5e7e11b478616821995053968a74b76043c55448c46381/GitPython-3.1.18.tar.gz" + "hash": "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c", + "url": "https://files.pythonhosted.org/packages/b6/a1/106fd9fa2dd989b6fb36e5893961f82992cf676381707253e0bf93eb1662/GitPython-3.1.43.tar.gz" } ], "project_name": "gitpython", "requires_dists": [ + "coverage[toml]; extra == \"test\"", + "ddt!=1.4.3,>=1.1.1; extra == \"test\"", "gitdb<5,>=4.0.1", - "typing-extensions>=3.7.4.0; python_version < \"3.8\"" + "mock; python_version < \"3.8\" and extra == \"test\"", + "mypy; extra == \"test\"", + "pre-commit; extra == \"test\"", + "pytest-cov; extra == \"test\"", + "pytest-instafail; extra == \"test\"", + "pytest-mock; extra == \"test\"", + "pytest-sugar; extra == \"test\"", + "pytest>=7.3.1; extra == \"test\"", + "sphinx-autodoc-typehints; extra == \"doc\"", + "sphinx-rtd-theme; extra == \"doc\"", + "sphinx==4.3.2; extra == \"doc\"", + "sphinxcontrib-applehelp<=1.0.4,>=1.0.2; extra == \"doc\"", + "sphinxcontrib-devhelp==1.0.2; extra == \"doc\"", + "sphinxcontrib-htmlhelp<=2.0.1,>=2.0.0; extra == \"doc\"", + "sphinxcontrib-qthelp==1.0.3; extra == \"doc\"", + "sphinxcontrib-serializinghtml==1.1.5; extra == \"doc\"", + "typing-extensions; python_version < \"3.11\" and extra == \"test\"", + "typing-extensions>=3.7.4.3; python_version < \"3.8\"" + ], + "requires_python": ">=3.7", + "version": "3.1.43" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", + "url": "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb", + "url": "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz" + } + ], + "project_name": "markdown-it-py", + "requires_dists": [ + "commonmark~=0.9; extra == \"compare\"", + "coverage; extra == \"testing\"", + "gprof2dot; extra == \"profiling\"", + "jupyter_sphinx; extra == \"rtd\"", + "linkify-it-py<3,>=1; extra == \"linkify\"", + "markdown~=3.4; extra == \"compare\"", + "mdit-py-plugins; extra == \"plugins\"", + "mdit-py-plugins; extra == \"rtd\"", + "mdurl~=0.1", + "mistletoe~=1.0; extra == \"compare\"", + "mistune~=2.0; extra == \"compare\"", + "myst-parser; extra == \"rtd\"", + "panflute~=2.3; extra == \"compare\"", + "pre-commit~=3.0; extra == \"code-style\"", + "psutil; extra == \"benchmarking\"", + "pytest-benchmark; extra == \"benchmarking\"", + "pytest-cov; extra == \"testing\"", + "pytest-regressions; extra == \"testing\"", + "pytest; extra == \"benchmarking\"", + "pytest; extra == \"testing\"", + "pyyaml; extra == \"rtd\"", + "sphinx-copybutton; extra == \"rtd\"", + "sphinx-design; extra == \"rtd\"", + "sphinx; extra == \"rtd\"", + "sphinx_book_theme; extra == \"rtd\"" + ], + "requires_python": ">=3.8", + "version": "3.0.0" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", + "url": "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", + "url": "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz" + } ], - "requires_python": ">=3.6", - "version": "3.1.18" + "project_name": "mdurl", + "requires_dists": [], + "requires_python": ">=3.7", + "version": "0.1.2" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "4a7317d5e3b17a3dccb6a8cfe67dab65b20551404c52c8ed41279fa4f0cb4cda", - "url": "https://files.pythonhosted.org/packages/64/dd/171c9fb653591cf265bcc89c436eec75c9bde3dec921cc236fa71e5698df/pbr-6.0.0-py2.py3-none-any.whl" + "hash": "a776ae228892d8013649c0aeccbb3d5f99ee15e005a4cbb7e61d55a067b28a2a", + "url": "https://files.pythonhosted.org/packages/1d/44/6a65ecd630393d47ad3e7d5354768cb7f9a10b3a0eb2cd8c6f52b28211ee/pbr-6.1.0-py2.py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9", - "url": "https://files.pythonhosted.org/packages/8d/c2/ee43b3b11bf2b40e56536183fc9f22afbb04e882720332b6276ee2454c24/pbr-6.0.0.tar.gz" + "hash": "788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24", + "url": "https://files.pythonhosted.org/packages/b2/35/80cf8f6a4f34017a7fe28242dc45161a1baa55c41563c354d8147e8358b2/pbr-6.1.0.tar.gz" } ], "project_name": "pbr", "requires_dists": [], "requires_python": ">=2.6", - "version": "6.0.0" + "version": "6.1.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5", - "url": "https://files.pythonhosted.org/packages/40/da/a175a35cf5583580e90ac3e2a3dbca90e43011593ae62ce63f79d7b28d92/PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl" + "hash": "b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a", + "url": "https://files.pythonhosted.org/packages/f7/3f/01c8b82017c199075f8f788d0d906b9ffbbc5a47dc9918a945e13d5a2bda/pygments-2.18.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6", - "url": "https://files.pythonhosted.org/packages/0d/46/62ae77677e532c0af6c81ddd6f3dbc16bdcc1208b077457354442d220bfb/PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl" + "hash": "786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", + "url": "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz" + } + ], + "project_name": "pygments", + "requires_dists": [ + "colorama>=0.4.6; extra == \"windows-terminal\"" + ], + "requires_python": ">=3.8", + "version": "2.18.0" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725", + "url": "https://files.pythonhosted.org/packages/82/72/04fcad41ca56491995076630c3ec1e834be241664c0c09a64c9a2589b507/PyYAML-6.0.2-cp39-cp39-musllinux_1_1_x86_64.whl" + }, + { + "algorithm": "sha256", + "hash": "a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f", + "url": "https://files.pythonhosted.org/packages/0a/02/6ec546cd45143fdf9840b2c6be8d875116a64076218b61d68e12548e5839/PyYAML-6.0.2-cp39-cp39-macosx_11_0_arm64.whl" }, { "algorithm": "sha256", - "hash": "c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859", - "url": "https://files.pythonhosted.org/packages/0e/88/21b2f16cb2123c1e9375f2c93486e35fdc86e63f02e274f0e99c589ef153/PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl" + "hash": "d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290", + "url": "https://files.pythonhosted.org/packages/0e/9a/8cc68be846c972bda34f6c2a93abb644fb2476f4dcc924d52175786932c9/PyYAML-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" }, { "algorithm": "sha256", - "hash": "b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0", - "url": "https://files.pythonhosted.org/packages/4a/4b/c71ef18ef83c82f99e6da8332910692af78ea32bd1d1d76c9787dfa36aea/PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl" + "hash": "d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d", + "url": "https://files.pythonhosted.org/packages/20/52/551c69ca1501d21c0de51ddafa8c23a0191ef296ff098e98358f69080577/PyYAML-6.0.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl" }, { "algorithm": "sha256", - "hash": "9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8", - "url": "https://files.pythonhosted.org/packages/57/c5/5d09b66b41d549914802f482a2118d925d876dc2a35b2d127694c1345c34/PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl" + "hash": "3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19", + "url": "https://files.pythonhosted.org/packages/3d/32/e7bd8535d22ea2874cef6a81021ba019474ace0d13a4819c2a4bce79bd6a/PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c", - "url": "https://files.pythonhosted.org/packages/7d/39/472f2554a0f1e825bd7c5afc11c817cd7a2f3657460f7159f691fbb37c51/PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e", + "url": "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz" }, { "algorithm": "sha256", - "hash": "1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595", - "url": "https://files.pythonhosted.org/packages/7f/5d/2779ea035ba1e533c32ed4a249b4e0448f583ba10830b21a3cddafe11a4e/PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl" + "hash": "688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d", + "url": "https://files.pythonhosted.org/packages/65/d8/b7a1db13636d7fb7d4ff431593c510c8b8fca920ade06ca8ef20015493c5/PyYAML-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl" }, { "algorithm": "sha256", - "hash": "5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6", - "url": "https://files.pythonhosted.org/packages/ac/6c/967d91a8edf98d2b2b01d149bd9e51b8f9fb527c98d80ebb60c6b21d60c4/PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "hash": "d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5", + "url": "https://files.pythonhosted.org/packages/74/cc/20c34d00f04d785f2028737e2e2a8254e1425102e730fee1d6396f832577/PyYAML-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" }, { "algorithm": "sha256", - "hash": "28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696", - "url": "https://files.pythonhosted.org/packages/c1/39/47ed4d65beec9ce07267b014be85ed9c204fa373515355d3efa62d19d892/PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl" + "hash": "24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a", + "url": "https://files.pythonhosted.org/packages/74/d9/323a59d506f12f498c2097488d80d16f4cf965cee1791eab58b56b19f47a/PyYAML-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl" }, { "algorithm": "sha256", - "hash": "7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735", - "url": "https://files.pythonhosted.org/packages/c8/6b/6600ac24725c7388255b2f5add93f91e58a5d7efaf4af244fdbcc11a541b/PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706", + "url": "https://files.pythonhosted.org/packages/8c/ab/6226d3df99900e580091bb44258fde77a8433511a86883bd4681ea19a858/PyYAML-6.0.2-cp38-cp38-musllinux_1_1_x86_64.whl" }, { "algorithm": "sha256", - "hash": "bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43", - "url": "https://files.pythonhosted.org/packages/cd/e5/af35f7ea75cf72f2cd079c95ee16797de7cd71f29ea7c68ae5ce7be1eda0/PyYAML-6.0.1.tar.gz" + "hash": "0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e", + "url": "https://files.pythonhosted.org/packages/d7/12/7322c1e30b9be969670b672573d45479edef72c9a0deac3bb2868f5d7469/PyYAML-6.0.2-cp39-cp39-musllinux_1_1_aarch64.whl" }, { "algorithm": "sha256", - "hash": "a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5", - "url": "https://files.pythonhosted.org/packages/e1/a1/27bfac14b90adaaccf8c8289f441e9f76d94795ec1e7a8f134d9f2cb3d0b/PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "hash": "f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12", + "url": "https://files.pythonhosted.org/packages/e9/6c/6e1b7f40181bc4805e2e07f4abc10a88ce4648e7e95ff1abe4ae4014a9b2/PyYAML-6.0.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl" + }, + { + "algorithm": "sha256", + "hash": "9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083", + "url": "https://files.pythonhosted.org/packages/fd/7f/2c3697bba5d4aa5cc2afe81826d73dfae5f049458e44732c7a0938baa673/PyYAML-6.0.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" } ], "project_name": "pyyaml", "requires_dists": [], - "requires_python": ">=3.6", - "version": "6.0.1" + "requires_python": ">=3.8", + "version": "6.0.2" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c", - "url": "https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl" + "hash": "9836f5096eb2172c9e77df411c1b009bace4193d6a481d534fea75ebba758283", + "url": "https://files.pythonhosted.org/packages/9a/e2/10e9819cf4a20bd8ea2f5dabafc2e6bf4a78d6a0965daeb60a4b34d1c11f/rich-13.9.3-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e", - "url": "https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d/setuptools-69.2.0.tar.gz" + "hash": "bc1e01b899537598cf02579d2b9f4a415104d3fc439313a7a2c165d76557a08e", + "url": "https://files.pythonhosted.org/packages/d9/e9/cf9ef5245d835065e6673781dbd4b8911d352fb770d56cf0879cf11b7ee1/rich-13.9.3.tar.gz" } ], - "project_name": "setuptools", + "project_name": "rich", "requires_dists": [ - "build[virtualenv]; extra == \"testing\"", - "build[virtualenv]>=1.0.3; extra == \"testing-integration\"", - "filelock>=3.4.0; extra == \"testing\"", - "filelock>=3.4.0; extra == \"testing-integration\"", - "furo; extra == \"docs\"", - "importlib-metadata; extra == \"testing\"", - "ini2toml[lite]>=0.9; extra == \"testing\"", - "jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"testing\"", - "jaraco.envs>=2.2; extra == \"testing\"", - "jaraco.envs>=2.2; extra == \"testing-integration\"", - "jaraco.packaging>=9.3; extra == \"docs\"", - "jaraco.path>=3.2.0; extra == \"testing\"", - "jaraco.path>=3.2.0; extra == \"testing-integration\"", - "jaraco.tidelift>=1.4; extra == \"docs\"", - "mypy==1.9; extra == \"testing\"", - "packaging>=23.2; extra == \"testing\"", - "packaging>=23.2; extra == \"testing-integration\"", - "pip>=19.1; extra == \"testing\"", - "pygments-github-lexers==0.0.5; extra == \"docs\"", - "pytest-checkdocs>=2.4; extra == \"testing\"", - "pytest-cov; platform_python_implementation != \"PyPy\" and extra == \"testing\"", - "pytest-enabler; extra == \"testing-integration\"", - "pytest-enabler>=2.2; extra == \"testing\"", - "pytest-home>=0.5; extra == \"testing\"", - "pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"", - "pytest-perf; sys_platform != \"cygwin\" and extra == \"testing\"", - "pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"testing\"", - "pytest-timeout; extra == \"testing\"", - "pytest-xdist; extra == \"testing-integration\"", - "pytest-xdist>=3; extra == \"testing\"", - "pytest; extra == \"testing-integration\"", - "pytest>=6; extra == \"testing\"", - "rst.linker>=1.9; extra == \"docs\"", - "sphinx-favicon; extra == \"docs\"", - "sphinx-inline-tabs; extra == \"docs\"", - "sphinx-lint; extra == \"docs\"", - "sphinx-notfound-page<2,>=1; extra == \"docs\"", - "sphinx-reredirects; extra == \"docs\"", - "sphinx<7.2.5; extra == \"docs\"", - "sphinx>=3.5; extra == \"docs\"", - "sphinxcontrib-towncrier; extra == \"docs\"", - "tomli-w>=1.0.0; extra == \"testing\"", - "tomli; extra == \"testing\"", - "tomli; extra == \"testing-integration\"", - "virtualenv>=13.0.0; extra == \"testing\"", - "virtualenv>=13.0.0; extra == \"testing-integration\"", - "wheel; extra == \"testing\"", - "wheel; extra == \"testing-integration\"" + "ipywidgets<9,>=7.5.1; extra == \"jupyter\"", + "markdown-it-py>=2.2.0", + "pygments<3.0.0,>=2.13.0", + "typing-extensions<5.0,>=4.0.0; python_version < \"3.11\"" ], - "requires_python": ">=3.8", - "version": "69.2.0" + "requires_python": ">=3.8.0", + "version": "13.9.3" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254", - "url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" + "hash": "a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8", + "url": "https://files.pythonhosted.org/packages/31/2d/90165d51ecd38f9a02c6832198c13a4e48652485e2ccf863ebb942c531b6/setuptools-75.2.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "url": "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz" + "hash": "753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec", + "url": "https://files.pythonhosted.org/packages/07/37/b31be7e4b9f13b59cde9dcaeff112d401d49e0dc5b37ed4a9fc8fb12f409/setuptools-75.2.0.tar.gz" } ], - "project_name": "six", - "requires_dists": [], - "requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7", - "version": "1.16.0" + "project_name": "setuptools", + "requires_dists": [ + "build[virtualenv]>=1.0.3; extra == \"test\"", + "filelock>=3.4.0; extra == \"test\"", + "furo; extra == \"doc\"", + "importlib-metadata>=6; python_version < \"3.10\" and extra == \"core\"", + "importlib-metadata>=7.0.2; python_version < \"3.10\" and extra == \"type\"", + "importlib-resources>=5.10.2; python_version < \"3.9\" and extra == \"core\"", + "ini2toml[lite]>=0.14; extra == \"test\"", + "jaraco.collections; extra == \"core\"", + "jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"test\"", + "jaraco.develop>=7.21; sys_platform != \"cygwin\" and extra == \"type\"", + "jaraco.envs>=2.2; extra == \"test\"", + "jaraco.functools; extra == \"core\"", + "jaraco.packaging>=9.3; extra == \"doc\"", + "jaraco.path>=3.2.0; extra == \"test\"", + "jaraco.test; extra == \"test\"", + "jaraco.text>=3.7; extra == \"core\"", + "jaraco.tidelift>=1.4; extra == \"doc\"", + "more-itertools; extra == \"core\"", + "more-itertools>=8.8; extra == \"core\"", + "mypy==1.11.*; extra == \"type\"", + "packaging; extra == \"core\"", + "packaging>=23.2; extra == \"test\"", + "packaging>=24; extra == \"core\"", + "pip>=19.1; extra == \"test\"", + "platformdirs>=2.6.2; extra == \"core\"", + "pygments-github-lexers==0.0.5; extra == \"doc\"", + "pyproject-hooks!=1.1; extra == \"doc\"", + "pyproject-hooks!=1.1; extra == \"test\"", + "pytest!=8.1.*,>=6; extra == \"test\"", + "pytest-checkdocs>=2.4; extra == \"check\"", + "pytest-cov; extra == \"cover\"", + "pytest-enabler>=2.2; extra == \"enabler\"", + "pytest-home>=0.5; extra == \"test\"", + "pytest-mypy; extra == \"type\"", + "pytest-perf; sys_platform != \"cygwin\" and extra == \"test\"", + "pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"check\"", + "pytest-subprocess; extra == \"test\"", + "pytest-timeout; extra == \"test\"", + "pytest-xdist>=3; extra == \"test\"", + "rst.linker>=1.9; extra == \"doc\"", + "ruff>=0.5.2; sys_platform != \"cygwin\" and extra == \"check\"", + "sphinx-favicon; extra == \"doc\"", + "sphinx-inline-tabs; extra == \"doc\"", + "sphinx-lint; extra == \"doc\"", + "sphinx-notfound-page<2,>=1; extra == \"doc\"", + "sphinx-reredirects; extra == \"doc\"", + "sphinx>=3.5; extra == \"doc\"", + "sphinxcontrib-towncrier; extra == \"doc\"", + "tomli-w>=1.0.0; extra == \"test\"", + "tomli>=2.0.1; python_version < \"3.11\" and extra == \"core\"", + "towncrier<24.7; extra == \"doc\"", + "virtualenv>=13.0.0; extra == \"test\"", + "wheel>=0.43.0; extra == \"core\"", + "wheel>=0.44.0; extra == \"test\"" + ], + "requires_python": ">=3.8", + "version": "75.2.0" }, { "artifacts": [ @@ -287,33 +417,54 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "1c15d95766ca0569cad14cb6272d4d31dae66b011a929d7c18219c176ea1b5c9", - "url": "https://files.pythonhosted.org/packages/eb/f1/c7c6205c367c764ee173537f7eaf070bba4dd0fa11bf081813c2f75285a3/stevedore-5.2.0-py3-none-any.whl" + "hash": "1efd34ca08f474dad08d9b19e934a22c68bb6fe416926479ba29e5013bcc8f78", + "url": "https://files.pythonhosted.org/packages/ec/50/70762bdb23f6c2b746b90661f461d33c4913a22a46bb5265b10947e85ffb/stevedore-5.3.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "46b93ca40e1114cea93d738a6c1e365396981bb6bb78c27045b7587c9473544d", - "url": "https://files.pythonhosted.org/packages/e7/c1/b210bf1071c96ecfcd24c2eeb4c828a2a24bf74b38af13896d02203b1eec/stevedore-5.2.0.tar.gz" + "hash": "9a64265f4060312828151c204efbe9b7a9852a0d9228756344dbc7e4023e375a", + "url": "https://files.pythonhosted.org/packages/c4/59/f8aefa21020054f553bf7e3b405caec7f8d1f432d9cb47e34aaa244d8d03/stevedore-5.3.0.tar.gz" } ], "project_name": "stevedore", "requires_dists": [ - "pbr!=2.1.0,>=2.0.0" + "pbr>=2.0.0" ], "requires_python": ">=3.8", - "version": "5.2.0" + "version": "5.3.0" + }, + { + "artifacts": [ + { + "algorithm": "sha256", + "hash": "04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", + "url": "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl" + }, + { + "algorithm": "sha256", + "hash": "1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8", + "url": "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz" + } + ], + "project_name": "typing-extensions", + "requires_dists": [], + "requires_python": ">=3.8", + "version": "4.12.2" } ], "platform_tag": null } ], + "only_builds": [], + "only_wheels": [], + "overridden": [], "path_mappings": {}, - "pex_version": "2.1.137", - "pip_version": "23.1.2", + "pex_version": "2.16.2", + "pip_version": "24.0", "prefer_older_binary": false, "requirements": [ - "GitPython==3.1.18", - "bandit==1.7.0", + "GitPython>=3.1.24", + "bandit<1.8,>=1.7.0", "setuptools" ], "requires_python": [ diff --git a/test-requirements.txt b/test-requirements.txt index b101e0b0fc..4392ed49b3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ pylint==3.1.0 pylint-plugin-utils>=0.4 black==22.3.0 pre-commit==2.1.0 -bandit==1.7.0 +bandit==1.7.10 isort>=4.2.5 mock==5.1.0 nose>=1.3.7 From 36fddec919534516f9e9a5b59455845e7015fa10 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 13:14:24 -0500 Subject: [PATCH 11/13] add merge conflict magnet --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a55bd04633..02f80e1d79 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -36,7 +36,7 @@ Fixed Changed ~~~~~~~ * Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118 -* Bumped many deps based on the lockfile generated by pants+pex. #6181 #6227 #6200 #6252 (by @cognifloyd and @nzlosh) +* Bumped many deps based on the lockfiles generated by pants+pex. #6181 #6227 #6200 #6252 #6268 (by @cognifloyd and @nzlosh) * Switch to python3's standard lib unittest from unittest2, a backport of python3 unittest features for python2. #6187 (by @nzlosh) * Drop Python 3.6 testing in CircleCI. #6080 Contributed by (@philipphomberger Schwarz IT KG) From f2a72b07e0ab76f2fc440f147d1d0b9eda945117 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 13:43:06 -0500 Subject: [PATCH 12/13] dedup pygments dependency definition --- BUILD.tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.tools b/BUILD.tools index 21f71c1508..5035397a63 100644 --- a/BUILD.tools +++ b/BUILD.tools @@ -41,7 +41,7 @@ python_requirement( "pytest-benchmark[histogram]==3.4.1", # used for st2common/benchmarks # "pytest-timer[colorama]", # report test timing (--with-timer ala nose-timer) "pytest-icdiff", # make diff output easier to read - "pygments", # highlight code in tracebacks + # "pygments", # highlight code in tracebacks (already included in requirements-pants.txt) # # other possible plugins # "pytest-timeout", # time limit on tests From fab2180320d22541767eebf5be1f65aaf1119d7c Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 24 Oct 2024 13:51:09 -0500 Subject: [PATCH 13/13] silence new bandit warning Test results: >> Issue: [B507:ssh_no_host_key_verification] Paramiko call with policy set to automatically trust the unknown host key. Severity: High Confidence: Medium CWE: CWE-295 (https://cwe.mitre.org/data/definitions/295.html) More Info: https://bandit.readthedocs.io/en/1.7.10/plugins/b507_ssh_no_host_key_verification.html Location: ./st2common/st2common/runners/paramiko_ssh.py:781:8 780 client = paramiko.SSHClient() 781 client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) 782 -------------------------------------------------- Code scanned: Total lines of code: 21204 Total lines skipped (#nosec): 0 Total potential issues skipped due to specifically being disabled (e.g., #nosec BXXX): 0 Run metrics: Total issues (by severity): Undefined: 0 Low: 15 Medium: 13 High: 1 Total issues (by confidence): Undefined: 0 Low: 3 Medium: 13 High: 13 Files skipped (0): --- st2common/st2common/runners/paramiko_ssh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/st2common/st2common/runners/paramiko_ssh.py b/st2common/st2common/runners/paramiko_ssh.py index 7530a532d9..df1c492e89 100644 --- a/st2common/st2common/runners/paramiko_ssh.py +++ b/st2common/st2common/runners/paramiko_ssh.py @@ -778,7 +778,8 @@ def _connect(self, host, socket=None): conninfo["sock"] = socket client = paramiko.SSHClient() - client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + # FIXME: Allow the admin or end user control the host key policy + client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) # nosec extra = {"_conninfo": conninfo} self.logger.debug("Connection info", extra=extra)