Skip to content

Upgrade pants from 2.16.0a0 to 2.16.0rc0 #5950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions BUILD.tools
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using BUILD, and as a general rule using only that is good. Pants supports BUILD.*, and I think it helped to cleanly separate concerns between BUILD (for our code) and BUILD.tools (for the tools resolves/requirements).

Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# This BUILD file has requirements for most of the tools resolves

python_requirement(
name="bandit-reqs",
resolve="bandit",
requirements=[
"bandit==1.7.0",
"setuptools",
"GitPython==3.1.18",
# bandit needs stevedore which needs importlib-metadata<5
# see: https://github.com/PyCQA/bandit/pull/952
"importlib-metadata<5;python_version<'3.8'",
],
)

python_requirement(
name="black-reqs",
resolve="black",
requirements=[
"black==22.3.0",
"typing-extensions>=3.10.0.0;python_version<'3.10'",
],
)

python_requirement(
name="flake8-reqs",
resolve="flake8",
requirements=[
"flake8==4.0.1", # st2flake8 does not support flake8 v5
# license check plugin
"st2flake8==0.1.0", # TODO: remove in favor of regex-lint or preamble
],
)

# for pants-plugins, see //pants-plugins/BUILD
# for pylint, see //pylint_plugins/BUILD

python_requirement(
name="pytest-reqs",
resolve="pytest",
requirements=[
"pytest==7.0.1", # copied from https://www.pantsbuild.org/v2.14/docs/reference-pytest#version
"pytest-benchmark[histogram]==3.4.1",
# "pytest-timer[colorama]",
"pytest-icdiff",
"pygments",
# "pytest-timeout",
# "pytest-mock",
"pytest-cov>=2.12,!=2.12.1,<3.1",
"pytest-xdist>=2.5,<3",
],
)

python_requirement(
name="setuptools-reqs",
resolve="setuptools",
requirements=[
# setuptools 59.7 (at least) does not support python 3.6
"setuptools>=50.3.0,<59.0",
"wheel>=0.35.1,<0.38",
],
)

python_requirement(
name="twine-reqs",
resolve="twine",
requirements=[
"twine>=3.7.1,<3.8",
"colorama>=0.4.3",
],
)
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Added
#5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850
#5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 #5864 #5874 #5884 #5893 #5891
#5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926 #5927 #5925 #5928 #5929 #5930
#5931 #5932 #5948 #5949
#5931 #5932 #5948 #5949 #5950
Contributed by @cognifloyd

* Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
Expand Down
32 changes: 16 additions & 16 deletions lockfiles/bandit.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// {
// "version": 3,
// "valid_for_interpreter_constraints": [
// "CPython<3.10,>=3.7",
// "CPython<3.9,>=3.6"
// "CPython<3.10,>=3.6"
// ],
// "generated_with_requirements": [
// "GitPython==3.1.18",
// "bandit==1.7.0",
// "importlib-metadata<5; python_version < \"3.8\"",
// "setuptools"
Expand Down Expand Up @@ -52,7 +52,7 @@
"stevedore>=1.20.0"
],
"requires_python": ">=3.5",
"version": "1.7"
"version": "1.7.0"
},
{
"artifacts": [
Expand Down Expand Up @@ -137,19 +137,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "db2317ff07c84c4c63648c9064a79fe9d9f5c7ce85a9099d4b6258b3db83225a",
"url": "https://files.pythonhosted.org/packages/e5/37/10e8a53f196cf0bcb93008daed42e2c47c7876430a7efd044ff4d647f30a/pbr-5.11.0-py2.py3-none-any.whl"
"hash": "567f09558bae2b3ab53cb3c1e2e33e726ff3338e7bae3db5dc954b3a44eef12b",
"url": "https://files.pythonhosted.org/packages/01/06/4ab11bf70db5a60689fc521b636849c8593eb67a2c6bdf73a16c72d16a12/pbr-5.11.1-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "b97bc6695b2aff02144133c2e7399d5885223d42b7912ffaec2ca3898e673bfe",
"url": "https://files.pythonhosted.org/packages/52/fb/630d52aaca8fc7634a0711b6ae12a0e828b6f9264bd8051225025c3ed075/pbr-5.11.0.tar.gz"
"hash": "aefc51675b0b533d56bb5fd1c8c6c0522fe31896679882e1c4c63d5e4a0fccb3",
"url": "https://files.pythonhosted.org/packages/02/d8/acee75603f31e27c51134a858e0dea28d321770c5eedb9d1d673eb7d3817/pbr-5.11.1.tar.gz"
}
],
"project_name": "pbr",
"requires_dists": [],
"requires_python": ">=2.6",
"version": "5.11"
"version": "5.11.1"
},
{
"artifacts": [
Expand Down Expand Up @@ -247,7 +247,7 @@
"project_name": "pyyaml",
"requires_dists": [],
"requires_python": ">=3.6",
"version": "6"
"version": "6.0"
},
{
"artifacts": [
Expand Down Expand Up @@ -292,7 +292,7 @@
"wheel; extra == \"testing\""
],
"requires_python": ">=3.6",
"version": "59.6"
"version": "59.6.0"
},
{
"artifacts": [
Expand All @@ -310,7 +310,7 @@
"project_name": "six",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7",
"version": "1.16"
"version": "1.16.0"
},
{
"artifacts": [
Expand All @@ -328,7 +328,7 @@
"project_name": "smmap",
"requires_dists": [],
"requires_python": ">=3.6",
"version": "5"
"version": "5.0.0"
},
{
"artifacts": [
Expand Down Expand Up @@ -398,24 +398,24 @@
"sphinx; extra == \"docs\""
],
"requires_python": ">=3.6",
"version": "3.6"
"version": "3.6.0"
}
],
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.108",
"pex_version": "2.1.131",
"pip_version": "20.3.4-patched",
"prefer_older_binary": false,
"requirements": [
"GitPython==3.1.18",
"bandit==1.7.0",
"importlib-metadata<5; python_version < \"3.8\"",
"setuptools"
],
"requires_python": [
"<3.10,>=3.7",
"<3.9,>=3.6"
"<3.10,>=3.6"
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
Expand Down
74 changes: 56 additions & 18 deletions lockfiles/black.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// {
// "version": 3,
// "valid_for_interpreter_constraints": [
// "CPython<3.9,>=3.6.2"
// "CPython<3.10,>=3.6.2"
// ],
// "generated_with_requirements": [
// "black==22.3.0",
Expand Down Expand Up @@ -55,6 +55,16 @@
"hash": "06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b",
"url": "https://files.pythonhosted.org/packages/43/ba/fd965969581806c96110ce55855b7b4008678f5cbbf559c83db8aac30871/black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21",
"url": "https://files.pythonhosted.org/packages/51/ec/c87695b087b7525fd9c7732c630455f231d3df9a300b730bd0e04ea00f84/black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad",
"url": "https://files.pythonhosted.org/packages/56/74/c27c496223168af625d6bba8a14bc581e7742bf7248504a4b5743c374767/black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82",
Expand All @@ -65,11 +75,21 @@
"hash": "863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0",
"url": "https://files.pythonhosted.org/packages/98/a0/98fe3aee7a08c7c9d470e38326cefb86372fb08332125d5b0414a22ab49f/black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20",
"url": "https://files.pythonhosted.org/packages/a4/43/940f848d7d1ecf0be18453a293e5736e9ce60fd6197386a791bcc491f232/black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl"
},
{
"algorithm": "sha256",
"hash": "e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163",
"url": "https://files.pythonhosted.org/packages/a9/64/4682e5c7ca539bef71cb9be592f649ff5f1e1134a8e72e2bff8632ade99d/black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl"
},
{
"algorithm": "sha256",
"hash": "30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a",
"url": "https://files.pythonhosted.org/packages/e5/b7/e4e8907dffdac70f018ddb89681dbc77cbc7ac78d1f8a39259110a7e7943/black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79",
Expand Down Expand Up @@ -98,7 +118,7 @@
"uvloop>=0.15.2; extra == \"uvloop\""
],
"requires_python": ">=3.6.2",
"version": "22.3"
"version": "22.3.0"
},
{
"artifacts": [
Expand Down Expand Up @@ -181,21 +201,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d",
"url": "https://files.pythonhosted.org/packages/5c/eb/975c7c080f3223a5cdaff09612f3a5221e4ba534f7039db34c35d95fa6a5/mypy_extensions-0.4.3-py2.py3-none-any.whl"
"hash": "4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
"url": "https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8",
"url": "https://files.pythonhosted.org/packages/63/60/0582ce2eaced55f65a4406fc97beba256de4b7a95a0034c6576458c6519f/mypy_extensions-0.4.3.tar.gz"
"hash": "75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782",
"url": "https://files.pythonhosted.org/packages/98/a4/1ab47638b92648243faf97a5aeb6ea83059cc3624972ab6b8d2316078d3f/mypy_extensions-1.0.0.tar.gz"
}
],
"project_name": "mypy-extensions",
"requires_dists": [
"typing>=3.5.3; python_version < \"3.5\""
],
"requires_python": null,
"version": "0.4.3"
"requires_dists": [],
"requires_python": ">=3.5",
"version": "1.0.0"
},
{
"artifacts": [
Expand All @@ -213,7 +231,7 @@
"project_name": "pathspec",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7",
"version": "0.9"
"version": "0.9.0"
},
{
"artifacts": [
Expand All @@ -240,7 +258,7 @@
"sphinx-autodoc-typehints>=1.12; extra == \"docs\""
],
"requires_python": ">=3.6",
"version": "2.4"
"version": "2.4.0"
},
{
"artifacts": [
Expand All @@ -264,8 +282,8 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6",
"url": "https://files.pythonhosted.org/packages/40/1a/5731a1a3908f60032aead10c2ffc9af12ee708bc9a156ed14a5065a9873a/typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
"hash": "98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72",
"url": "https://files.pythonhosted.org/packages/d8/4e/db9505b53c44d7bc324a3d2e09bdf82b0943d6e08b183ae382860f482a87/typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
},
{
"algorithm": "sha256",
Expand All @@ -277,11 +295,21 @@
"hash": "39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2",
"url": "https://files.pythonhosted.org/packages/07/d2/d55702e8deba2c80282fea0df53130790d8f398648be589750954c2dcce4/typed_ast-1.5.4.tar.gz"
},
{
"algorithm": "sha256",
"hash": "3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97",
"url": "https://files.pythonhosted.org/packages/0b/e7/8ec06fc870254889198f933a595f139b7871b24bab1116d6128440731ea9/typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f",
"url": "https://files.pythonhosted.org/packages/2f/87/25abe9558ed6cbd83ad5bfdccf7210a7eefaaf0232f86de99f65992e91fd/typed_ast-1.5.4-cp38-cp38-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3",
"url": "https://files.pythonhosted.org/packages/2f/d5/02059fe6ca70b11bb831007962323160372ca83843e0bf296e8b6d833198/typed_ast-1.5.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
},
{
"algorithm": "sha256",
"hash": "cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6",
Expand All @@ -292,6 +320,11 @@
"hash": "a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47",
"url": "https://files.pythonhosted.org/packages/38/54/48f7d5b1f954f3a4d8f76e1a11c8497ae899b900cd5a67f826fa3937f701/typed_ast-1.5.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
},
{
"algorithm": "sha256",
"hash": "4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6",
"url": "https://files.pythonhosted.org/packages/40/1a/5731a1a3908f60032aead10c2ffc9af12ee708bc9a156ed14a5065a9873a/typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec",
Expand All @@ -316,6 +349,11 @@
"algorithm": "sha256",
"hash": "183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6",
"url": "https://files.pythonhosted.org/packages/e3/7c/7407838e9c540031439f2948bce2763cdd6882ebb72cc0a25b763c10529e/typed_ast-1.5.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35",
"url": "https://files.pythonhosted.org/packages/f9/57/89ac0020d5ffc762487376d0c78e5d02af795657f18c411155b73de3c765/typed_ast-1.5.4-cp39-cp39-macosx_10_9_x86_64.whl"
}
],
"project_name": "typed-ast",
Expand Down Expand Up @@ -370,22 +408,22 @@
"sphinx; extra == \"docs\""
],
"requires_python": ">=3.6",
"version": "3.6"
"version": "3.6.0"
}
],
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.108",
"pex_version": "2.1.131",
"pip_version": "20.3.4-patched",
"prefer_older_binary": false,
"requirements": [
"black==22.3.0",
"typing-extensions>=3.10.0.0; python_version < \"3.10\""
],
"requires_python": [
"<3.9,>=3.6.2"
"<3.10,>=3.6.2"
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
Expand Down
Loading