From 24f399503875ce937224afc6e0dfa550b5cb8fa4 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Sun, 22 Jan 2023 06:20:48 -0800 Subject: [PATCH] Upgrade Python to 3.11 and various deps. This removes the dependency on tomli in favor of the tomllib stdlib. --- lock.json | 92 ++++++------------ pants-support/tool-locks/autoflake.lock | 2 +- pants-support/tool-locks/black.lock | 50 ++++------ pants-support/tool-locks/isort.lock | 2 +- pants-support/tool-locks/mypy.lock | 44 +++------ pants-support/tool-locks/pytest.lock | 118 ++++++++---------------- pants.toml | 21 +++-- pyproject.toml | 2 +- requirements.txt | 3 +- science.toml | 2 +- science/BUILD | 7 -- science/config.py | 9 +- 12 files changed, 119 insertions(+), 233 deletions(-) diff --git a/lock.json b/lock.json index 6c2e393..47d2a39 100644 --- a/lock.json +++ b/lock.json @@ -6,7 +6,7 @@ // { // "version": 3, // "valid_for_interpreter_constraints": [ -// "CPython==3.10.*" +// "CPython==3.11.*" // ], // "generated_with_requirements": [ // "appdirs", @@ -14,8 +14,7 @@ // "filelock", // "httpx", // "packaging", -// "pytest==7.2.0", -// "tomli", +// "pytest==7.2.1", // "tqdm", // "types-appdirs", // "types-tqdm" @@ -176,26 +175,6 @@ "requires_python": ">=3.7", "version": "8.1.3" }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e", - "url": "https://files.pythonhosted.org/packages/e8/14/9c6a7e5f12294ccd6975a45e02899ed25468cd7c2c86f3d9725f387f9f5f/exceptiongroup-1.1.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23", - "url": "https://files.pythonhosted.org/packages/15/ab/dd27fb742b19a9d020338deb9ab9a28796524081bca880ac33c172c9a8f6/exceptiongroup-1.1.0.tar.gz" - } - ], - "project_name": "exceptiongroup", - "requires_dists": [ - "pytest>=6; extra == \"test\"" - ], - "requires_python": ">=3.7", - "version": "1.1.0" - }, { "artifacts": [ { @@ -320,37 +299,37 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", - "url": "https://files.pythonhosted.org/packages/9b/dd/b3c12c6d707058fa947864b67f0c4e0c39ef8610988d7baea9578f3c48f3/iniconfig-1.1.1-py2.py3-none-any.whl" + "hash": "b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374", + "url": "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32", - "url": "https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2/iniconfig-1.1.1.tar.gz" + "hash": "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", + "url": "https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913/iniconfig-2.0.0.tar.gz" } ], "project_name": "iniconfig", "requires_dists": [], - "requires_python": null, - "version": "1.1.1" + "requires_python": ">=3.7", + "version": "2.0.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3", - "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl" + "hash": "714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2", + "url": "https://files.pythonhosted.org/packages/ed/35/a31aed2993e398f6b09a790a181a7927eb14610ee8bbf02dc14d31677f1c/packaging-23.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3", - "url": "https://files.pythonhosted.org/packages/6b/f7/c240d7654ddd2d2f3f328d8468d4f1f876865f6b9038b146bec0a6737c65/packaging-22.0.tar.gz" + "hash": "b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97", + "url": "https://files.pythonhosted.org/packages/47/d5/aca8ff6f49aa5565df1c826e7bf5e85a6df852ee063600c1efa5b932968c/packaging-23.0.tar.gz" } ], "project_name": "packaging", "requires_dists": [], "requires_python": ">=3.7", - "version": "22.0" + "version": "23.0" }, { "artifacts": [ @@ -380,13 +359,13 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71", - "url": "https://files.pythonhosted.org/packages/67/68/a5eb36c3a8540594b6035e6cdae40c1ef1b6a2bfacbecc3d1a544583c078/pytest-7.2.0-py3-none-any.whl" + "hash": "c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5", + "url": "https://files.pythonhosted.org/packages/cc/02/8f59bf194c9a1ceac6330850715e9ec11e21e2408a30a596c65d54cf4d2a/pytest-7.2.1-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59", - "url": "https://files.pythonhosted.org/packages/0b/21/055f39bf8861580b43f845f9e8270c7786fe629b2f8562ff09007132e2e7/pytest-7.2.0.tar.gz" + "hash": "d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42", + "url": "https://files.pythonhosted.org/packages/e5/6c/f3a15217ac72912c28c5d7a7a8e87ff6d6475c9530595ae9f0f8dedd8dd8/pytest-7.2.1.tar.gz" } ], "project_name": "pytest", @@ -408,7 +387,7 @@ "xmlschema; extra == \"testing\"" ], "requires_python": ">=3.7", - "version": "7.2.0" + "version": "7.2.1" }, { "artifacts": [ @@ -448,24 +427,6 @@ "requires_python": ">=3.7", "version": "1.3.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": [ { @@ -515,26 +476,26 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "8871999c7f4a8cd24655dcb44cfcca03efd931a9b49e62530a8880bd909c5474", - "url": "https://files.pythonhosted.org/packages/5f/1f/08e461659f939d656b104b0dcfe89279cf26801b4c11f23d5a6b63e9ce52/types_tqdm-4.64.7.9-py3-none-any.whl" + "hash": "ba8deb1ba9370403ef2bacc4d61267af23b5b1f135dd14d516769b04cbf49615", + "url": "https://files.pythonhosted.org/packages/b2/6e/71c910364f535d423cb82e476b57d12c1dd75aa50f15eeb71b9b0e205b3f/types_tqdm-4.64.7.11-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "aecd96552e9c3b87e1926cb312734f135426ffc3254d8e64cfeb3ba591ef72c5", - "url": "https://files.pythonhosted.org/packages/24/c4/186ee3d88c7ec90a32a89646293cc98976cf8f75054a3642b4507b663984/types-tqdm-4.64.7.9.tar.gz" + "hash": "b7fb2daec65722cd92a4fb377b0c9575ce19d6012a1875b48bc14a44c72db546", + "url": "https://files.pythonhosted.org/packages/02/3d/e464c83e3dd7b53903943661202eb39282d75a0d7c209edd973473d9b9b7/types-tqdm-4.64.7.11.tar.gz" } ], "project_name": "types-tqdm", "requires_dists": [], "requires_python": null, - "version": "4.64.7.9" + "version": "4.64.7.11" } ], "platform_tag": null } ], "path_mappings": {}, - "pex_version": "2.1.119", + "pex_version": "2.1.121", "pip_version": "20.3.4-patched", "prefer_older_binary": false, "requirements": [ @@ -543,14 +504,13 @@ "filelock", "httpx", "packaging", - "pytest==7.2.0", - "tomli", + "pytest==7.2.1", "tqdm", "types-appdirs", "types-tqdm" ], "requires_python": [ - "==3.10.*" + "==3.11.*" ], "resolver_version": "pip-2020-resolver", "style": "universal", diff --git a/pants-support/tool-locks/autoflake.lock b/pants-support/tool-locks/autoflake.lock index ab6f7a9..0e3e200 100644 --- a/pants-support/tool-locks/autoflake.lock +++ b/pants-support/tool-locks/autoflake.lock @@ -89,7 +89,7 @@ } ], "path_mappings": {}, - "pex_version": "2.1.119", + "pex_version": "2.1.121", "pip_version": "20.3.4-patched", "prefer_older_binary": false, "requirements": [ diff --git a/pants-support/tool-locks/black.lock b/pants-support/tool-locks/black.lock index 7cda89b..726eaae 100644 --- a/pants-support/tool-locks/black.lock +++ b/pants-support/tool-locks/black.lock @@ -6,7 +6,7 @@ // { // "version": 3, // "valid_for_interpreter_constraints": [ -// "CPython==3.10.*" +// "CPython==3.11.*" // ], // "generated_with_requirements": [ // "black", @@ -37,13 +37,13 @@ }, { "algorithm": "sha256", - "hash": "9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d", - "url": "https://files.pythonhosted.org/packages/79/d9/60852a6fc2f85374db20a9767dacfe50c2172eb8388f46018c8daf836995/black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f", + "url": "https://files.pythonhosted.org/packages/a6/59/e873cc6807fb62c11131e5258ca15577a3b7452abad08dc49286cf8245e8/black-22.12.0.tar.gz" }, { "algorithm": "sha256", - "hash": "229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f", - "url": "https://files.pythonhosted.org/packages/a6/59/e873cc6807fb62c11131e5258ca15577a3b7452abad08dc49286cf8245e8/black-22.12.0.tar.gz" + "hash": "d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f", + "url": "https://files.pythonhosted.org/packages/e9/e0/6aa02d14785c4039b38bfed6f9ee28a952b2d101c64fc97b15811fa8bd04/black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" } ], "project_name": "black", @@ -127,53 +127,37 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca", - "url": "https://files.pythonhosted.org/packages/87/69/cd019a9473bcdfb38983e2d550ccb239264fc4c2fc32c42ac1b1cc2506b6/platformdirs-2.6.0-py3-none-any.whl" + "hash": "83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490", + "url": "https://files.pythonhosted.org/packages/c1/c7/9be9d651b93efce682b45142a6267034fc4215972780748618c02e236361/platformdirs-2.6.2-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e", - "url": "https://files.pythonhosted.org/packages/ec/4c/9af851448e55c57b30a13a72580306e628c3b431d97fdae9e0b8d4fa3685/platformdirs-2.6.0.tar.gz" + "hash": "e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2", + "url": "https://files.pythonhosted.org/packages/cf/4d/198b7e6c6c2b152f4f9f4cdf975d3590e33e63f1920f2d89af7f0390e6db/platformdirs-2.6.2.tar.gz" } ], "project_name": "platformdirs", "requires_dists": [ "appdirs==1.4.4; extra == \"test\"", - "furo>=2022.9.29; extra == \"docs\"", + "covdefaults>=2.2.2; extra == \"test\"", + "furo>=2022.12.7; extra == \"docs\"", "proselint>=0.13; extra == \"docs\"", "pytest-cov>=4; extra == \"test\"", "pytest-mock>=3.10; extra == \"test\"", "pytest>=7.2; extra == \"test\"", - "sphinx-autodoc-typehints>=1.19.4; extra == \"docs\"", - "sphinx>=5.3; extra == \"docs\"" - ], - "requires_python": ">=3.7", - "version": "2.6.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" - } + "sphinx-autodoc-typehints>=1.19.5; extra == \"docs\"", + "sphinx>=5.3; extra == \"docs\"", + "typing-extensions>=4.4; python_version < \"3.8\"" ], - "project_name": "tomli", - "requires_dists": [], "requires_python": ">=3.7", - "version": "2.0.1" + "version": "2.6.2" } ], "platform_tag": null } ], "path_mappings": {}, - "pex_version": "2.1.119", + "pex_version": "2.1.121", "pip_version": "20.3.4-patched", "prefer_older_binary": false, "requirements": [ @@ -181,7 +165,7 @@ "typing-extensions>=3.10.0.0; python_version < \"3.10\"" ], "requires_python": [ - "==3.10.*" + "==3.11.*" ], "resolver_version": "pip-2020-resolver", "style": "universal", diff --git a/pants-support/tool-locks/isort.lock b/pants-support/tool-locks/isort.lock index 8d4ff14..fa88461 100644 --- a/pants-support/tool-locks/isort.lock +++ b/pants-support/tool-locks/isort.lock @@ -56,7 +56,7 @@ } ], "path_mappings": {}, - "pex_version": "2.1.119", + "pex_version": "2.1.121", "pip_version": "20.3.4-patched", "prefer_older_binary": false, "requirements": [ diff --git a/pants-support/tool-locks/mypy.lock b/pants-support/tool-locks/mypy.lock index 1c690df..836c5a0 100644 --- a/pants-support/tool-locks/mypy.lock +++ b/pants-support/tool-locks/mypy.lock @@ -6,7 +6,7 @@ // { // "version": 3, // "valid_for_interpreter_constraints": [ -// "CPython==3.10.*" +// "CPython==3.11.*" // ], // "generated_with_requirements": [ // "mypy" @@ -41,28 +41,28 @@ }, { "algorithm": "sha256", - "hash": "bc9ec663ed6c8f15f4ae9d3c04c989b744436c16d26580eaa760ae9dd5d662eb", - "url": "https://files.pythonhosted.org/packages/39/05/7a7d58afc7d00e819e553ad2485a29141e14575e3b0c43b9da6f869ede4c/mypy-0.991-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "37bd02ebf9d10e05b00d71302d2c2e6ca333e6c2a8584a98c00e038db8121f05", + "url": "https://files.pythonhosted.org/packages/14/05/5a4206e269268f4aecb1096bf2375a231c959987ccf3e31313221b8bc153/mypy-0.991-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "7d17e0a9707d0772f4a7b878f04b4fd11f6f5bcb9b3813975a9b13c9332153ab", - "url": "https://files.pythonhosted.org/packages/44/d0/81d47bffc80d0cff84174aab266adc3401e735e13c5613418e825c146986/mypy-0.991-cp310-cp310-macosx_10_9_universal2.whl" + "hash": "1c8cd4fb70e8584ca1ed5805cbc7c017a3d1a29fb450621089ffed3e99d1857f", + "url": "https://files.pythonhosted.org/packages/28/9c/e1805f2fea93a92671f33b00dd577119f37e4a8b859d6f6ea62d3e9129fa/mypy-0.991-cp311-cp311-macosx_10_9_x86_64.whl" }, { "algorithm": "sha256", - "hash": "4307270436fd7694b41f913eb09210faff27ea4979ecbcd849e57d2da2f65305", - "url": "https://files.pythonhosted.org/packages/80/23/76e56e004acca691b4da4086a8c38bd67b7ae73536848dcab76cfed5c188/mypy-0.991-cp310-cp310-musllinux_1_1_x86_64.whl" + "hash": "26efb2fcc6b67e4d5a55561f39176821d2adf88f2745ddc72751b7890f3194ad", + "url": "https://files.pythonhosted.org/packages/4b/98/125e5d14222de8e92f44314f8df21a9c351b531b37c551526acd67486a7d/mypy-0.991-cp311-cp311-musllinux_1_1_x86_64.whl" }, { "algorithm": "sha256", - "hash": "0c8f3be99e8a8bd403caa8c03be619544bc2c77a7093685dcf308c6b109426c6", - "url": "https://files.pythonhosted.org/packages/87/ec/62fd00fa5d8ead3ecafed3eb99ee805911f41b11536c5940df1bcb2c845d/mypy-0.991-cp310-cp310-macosx_11_0_arm64.whl" + "hash": "d13674f3fb73805ba0c45eb6c0c3053d218aa1f7abead6e446d474529aafc372", + "url": "https://files.pythonhosted.org/packages/b8/ab/aa2e02fce8ee8885fe98ee2a0549290e9de5caa28febc0cf243bfab020e7/mypy-0.991-cp311-cp311-macosx_10_9_universal2.whl" }, { "algorithm": "sha256", - "hash": "0714258640194d75677e86c786e80ccf294972cc76885d3ebbb560f11db0003d", - "url": "https://files.pythonhosted.org/packages/d7/f4/dcab9f3c5ed410caca1b9374dbb2b2caa778d225e32f174e266e20291edf/mypy-0.991-cp310-cp310-macosx_10_9_x86_64.whl" + "hash": "209ee89fbb0deed518605edddd234af80506aec932ad28d73c08f1400ef80a33", + "url": "https://files.pythonhosted.org/packages/df/bb/3cf400e05e30939a0fc58b34e0662d8abe8e206464665065b56cf2ca9a62/mypy-0.991-cp311-cp311-macosx_11_0_arm64.whl" } ], "project_name": "mypy", @@ -99,24 +99,6 @@ "requires_python": null, "version": "0.4.3" }, - { - "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": [ { @@ -140,14 +122,14 @@ } ], "path_mappings": {}, - "pex_version": "2.1.119", + "pex_version": "2.1.121", "pip_version": "20.3.4-patched", "prefer_older_binary": false, "requirements": [ "mypy" ], "requires_python": [ - "==3.10.*" + "==3.11.*" ], "resolver_version": "pip-2020-resolver", "style": "universal", diff --git a/pants-support/tool-locks/pytest.lock b/pants-support/tool-locks/pytest.lock index c096451..af0fb71 100644 --- a/pants-support/tool-locks/pytest.lock +++ b/pants-support/tool-locks/pytest.lock @@ -6,12 +6,12 @@ // { // "version": 3, // "valid_for_interpreter_constraints": [ -// "CPython==3.10.*" +// "CPython==3.11.*" // ], // "generated_with_requirements": [ // "pytest-cov!=2.12.1,<3.1,>=2.12", // "pytest-xdist<3,>=2.5", -// "pytest==7.2.0" +// "pytest==7.2.1" // ], // "manylinux": "manylinux2014", // "requirement_constraints": [], @@ -79,48 +79,48 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "6c5ad996c6fa4d8ed669cfa1e8551348729d008a2caf81489ab9ea67cfbc7498", - "url": "https://files.pythonhosted.org/packages/04/92/44680ce5ace94160640152718fc51bcad0c7b5f2f43cfdc5bb155ded1d13/coverage-7.0.1-cp310-cp310-musllinux_1_1_x86_64.whl" + "hash": "411d4ff9d041be08fdfc02adf62e89c735b9468f6d8f6427f8a14b6bb0a85095", + "url": "https://files.pythonhosted.org/packages/ed/75/fa4b613e2d4d8b0773ac21061cedd29a7a158ab9139c932011fdafc0cbc3/coverage-7.0.5-cp311-cp311-musllinux_1_1_x86_64.whl" }, { "algorithm": "sha256", - "hash": "74f70cd92669394eaf8d7756d1b195c8032cf7bbbdfce3bc489d4e15b3b8cf73", - "url": "https://files.pythonhosted.org/packages/1c/ff/93b2bbf65eeabcc0217738666ab0fb70c5e257fef386a07f243620c1ecdc/coverage-7.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + "hash": "1caed2367b32cc80a2b7f58a9f46658218a19c6cfe5bc234021966dc3daa01f0", + "url": "https://files.pythonhosted.org/packages/53/6c/d206426bd4896df14f88581e47198e509a376f50e3ced18bce75f31aabb5/coverage-7.0.5-cp311-cp311-macosx_11_0_arm64.whl" }, { "algorithm": "sha256", - "hash": "a4a574a19eeb67575a5328a5760bbbb737faa685616586a9f9da4281f940109c", - "url": "https://files.pythonhosted.org/packages/2b/69/721e5ebcb178d6d6d54e345bd9a5b8ff2884359e9f507853ada02edb4fda/coverage-7.0.1.tar.gz" + "hash": "051afcbd6d2ac39298d62d340f94dbb6a1f31de06dfaf6fcef7b759dd3860c45", + "url": "https://files.pythonhosted.org/packages/84/b3/992a6b222b14c99e6d4aa9f448c670a5f614648597499de6ddc11be839e3/coverage-7.0.5.tar.gz" }, { "algorithm": "sha256", - "hash": "b3695c4f4750bca943b3e1f74ad4be8d29e4aeab927d50772c41359107bd5d5c", - "url": "https://files.pythonhosted.org/packages/34/fc/8033189f16a996a2788491904075c711834997f85f80a378460ac0f45959/coverage-7.0.1-cp310-cp310-macosx_10_9_x86_64.whl" + "hash": "30b5fec1d34cc932c1bc04017b538ce16bf84e239378b8f75220478645d11fca", + "url": "https://files.pythonhosted.org/packages/88/88/1bfb18b78f068ffae4c87cb39b0351e6709ce9a655cfe6b0a7e397b669f8/coverage-7.0.5-cp311-cp311-macosx_10_9_x86_64.whl" }, { "algorithm": "sha256", - "hash": "1e414dc32ee5c3f36544ea466b6f52f28a7af788653744b8570d0bf12ff34bc0", - "url": "https://files.pythonhosted.org/packages/3f/d3/7fcf9c6cd8254b7b41d0bde1cbed3ad3cdbbc8093509e72d11f4b59ecf6d/coverage-7.0.1-cp310-cp310-musllinux_1_1_i686.whl" + "hash": "7b05ed4b35bf6ee790832f68932baf1f00caa32283d66cc4d455c9e9d115aafc", + "url": "https://files.pythonhosted.org/packages/a4/3c/662aa204ff721bbad7321908013fca51ed6b64ae24e94c699f0789528111/coverage-7.0.5-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, { "algorithm": "sha256", - "hash": "d87717959d4d0ee9db08a0f1d80d21eb585aafe30f9b0a54ecf779a69cb015f6", - "url": "https://files.pythonhosted.org/packages/46/68/bb0bd60fb5b9991ba13268a9fda24dd7de0d9e229f9a51e1bec7900109fc/coverage-7.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + "hash": "e057e74e53db78122a3979f908973e171909a58ac20df05c33998d52e6d35757", + "url": "https://files.pythonhosted.org/packages/a4/dc/3671f11710feeb83fda4b2b7a70262c6bf7e32f8a43c31fa33b5d83bac0a/coverage-7.0.5-cp311-cp311-musllinux_1_1_i686.whl" }, { "algorithm": "sha256", - "hash": "fa6a5a224b7f4cfb226f4fc55a57e8537fcc096f42219128c2c74c0e7d0953e1", - "url": "https://files.pythonhosted.org/packages/60/1e/1a2c034ed0f396712f1886d42f76723b0da65579137ed756fe46c6741d6a/coverage-7.0.1-cp310-cp310-macosx_11_0_arm64.whl" + "hash": "29de916ba1099ba2aab76aca101580006adfac5646de9b7c010a0f13867cba45", + "url": "https://files.pythonhosted.org/packages/a8/98/e0308655f42fa5b1daf3574c79c32628936ed6fa11d8e8f3b970d185220a/coverage-7.0.5-cp311-cp311-musllinux_1_1_aarch64.whl" }, { "algorithm": "sha256", - "hash": "b66bb21a23680dee0be66557dc6b02a3152ddb55edf9f6723fa4a93368f7158d", - "url": "https://files.pythonhosted.org/packages/bd/a0/40d145658de47a8c17c47393048a43505c98ad103264e51e1d8f3a9d99c9/coverage-7.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" + "hash": "d254666d29540a72d17cc0175746cfb03d5123db33e67d1020e42dae611dc196", + "url": "https://files.pythonhosted.org/packages/c6/81/e01309e5ba812a767bfd3ef692a619ee459af4d9313e7244305561aa2341/coverage-7.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" }, { "algorithm": "sha256", - "hash": "854f22fa361d1ff914c7efa347398374cc7d567bdafa48ac3aa22334650dfba2", - "url": "https://files.pythonhosted.org/packages/ee/7e/9c8a9260a3c64d3c6b74ade620de142df04c3014e3cf39cddc620850359e/coverage-7.0.1-cp310-cp310-musllinux_1_1_aarch64.whl" + "hash": "19245c249aa711d954623d94f23cc94c0fd65865661f20b7781210cb97c471c0", + "url": "https://files.pythonhosted.org/packages/cc/55/40719c5b7b7503144ffcf55ead8d37c6e8ec2269293a11c5d7654caa5228/coverage-7.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl" } ], "project_name": "coverage", @@ -128,27 +128,7 @@ "tomli; python_full_version <= \"3.11.0a6\" and extra == \"toml\"" ], "requires_python": ">=3.7", - "version": "7.0.1" - }, - { - "artifacts": [ - { - "algorithm": "sha256", - "hash": "327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e", - "url": "https://files.pythonhosted.org/packages/e8/14/9c6a7e5f12294ccd6975a45e02899ed25468cd7c2c86f3d9725f387f9f5f/exceptiongroup-1.1.0-py3-none-any.whl" - }, - { - "algorithm": "sha256", - "hash": "bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23", - "url": "https://files.pythonhosted.org/packages/15/ab/dd27fb742b19a9d020338deb9ab9a28796524081bca880ac33c172c9a8f6/exceptiongroup-1.1.0.tar.gz" - } - ], - "project_name": "exceptiongroup", - "requires_dists": [ - "pytest>=6; extra == \"test\"" - ], - "requires_python": ">=3.7", - "version": "1.1.0" + "version": "7.0.5" }, { "artifacts": [ @@ -174,37 +154,37 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", - "url": "https://files.pythonhosted.org/packages/9b/dd/b3c12c6d707058fa947864b67f0c4e0c39ef8610988d7baea9578f3c48f3/iniconfig-1.1.1-py2.py3-none-any.whl" + "hash": "b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374", + "url": "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32", - "url": "https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2/iniconfig-1.1.1.tar.gz" + "hash": "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", + "url": "https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913/iniconfig-2.0.0.tar.gz" } ], "project_name": "iniconfig", "requires_dists": [], - "requires_python": null, - "version": "1.1.1" + "requires_python": ">=3.7", + "version": "2.0.0" }, { "artifacts": [ { "algorithm": "sha256", - "hash": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3", - "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl" + "hash": "714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2", + "url": "https://files.pythonhosted.org/packages/ed/35/a31aed2993e398f6b09a790a181a7927eb14610ee8bbf02dc14d31677f1c/packaging-23.0-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3", - "url": "https://files.pythonhosted.org/packages/6b/f7/c240d7654ddd2d2f3f328d8468d4f1f876865f6b9038b146bec0a6737c65/packaging-22.0.tar.gz" + "hash": "b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97", + "url": "https://files.pythonhosted.org/packages/47/d5/aca8ff6f49aa5565df1c826e7bf5e85a6df852ee063600c1efa5b932968c/packaging-23.0.tar.gz" } ], "project_name": "packaging", "requires_dists": [], "requires_python": ">=3.7", - "version": "22.0" + "version": "23.0" }, { "artifacts": [ @@ -252,13 +232,13 @@ "artifacts": [ { "algorithm": "sha256", - "hash": "892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71", - "url": "https://files.pythonhosted.org/packages/67/68/a5eb36c3a8540594b6035e6cdae40c1ef1b6a2bfacbecc3d1a544583c078/pytest-7.2.0-py3-none-any.whl" + "hash": "c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5", + "url": "https://files.pythonhosted.org/packages/cc/02/8f59bf194c9a1ceac6330850715e9ec11e21e2408a30a596c65d54cf4d2a/pytest-7.2.1-py3-none-any.whl" }, { "algorithm": "sha256", - "hash": "c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59", - "url": "https://files.pythonhosted.org/packages/0b/21/055f39bf8861580b43f845f9e8270c7786fe629b2f8562ff09007132e2e7/pytest-7.2.0.tar.gz" + "hash": "d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42", + "url": "https://files.pythonhosted.org/packages/e5/6c/f3a15217ac72912c28c5d7a7a8e87ff6d6475c9530595ae9f0f8dedd8dd8/pytest-7.2.1.tar.gz" } ], "project_name": "pytest", @@ -280,7 +260,7 @@ "xmlschema; extra == \"testing\"" ], "requires_python": ">=3.7", - "version": "7.2.0" + "version": "7.2.1" }, { "artifacts": [ @@ -354,40 +334,22 @@ ], "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" } ], "platform_tag": null } ], "path_mappings": {}, - "pex_version": "2.1.119", + "pex_version": "2.1.121", "pip_version": "20.3.4-patched", "prefer_older_binary": false, "requirements": [ "pytest-cov!=2.12.1,<3.1,>=2.12", "pytest-xdist<3,>=2.5", - "pytest==7.2.0" + "pytest==7.2.1" ], "requires_python": [ - "==3.10.*" + "==3.11.*" ], "resolver_version": "pip-2020-resolver", "style": "universal", diff --git a/pants.toml b/pants.toml index ee7bc96..2916bed 100644 --- a/pants.toml +++ b/pants.toml @@ -1,5 +1,5 @@ [GLOBAL] -pants_version = "2.15.0rc0" +pants_version = "2.15.0rc2" backend_packages = [ "pants.backend.python", @@ -31,26 +31,31 @@ config = "pyproject.toml" lockfile = "pants-support/tool-locks/mypy.lock" [pex-cli] -version = "v2.1.119" +version = "v2.1.121" known_versions = [ - "v2.1.119|linux_arm64|ffcb6d4feef57100462930c57b3e0521c1757ee30587c0edf74c762a3d32b953|4069627", - "v2.1.119|linux_x86_64|ffcb6d4feef57100462930c57b3e0521c1757ee30587c0edf74c762a3d32b953|4069627", - "v2.1.119|macos_arm64|ffcb6d4feef57100462930c57b3e0521c1757ee30587c0edf74c762a3d32b953|4069627", - "v2.1.119|macos_x86_64|ffcb6d4feef57100462930c57b3e0521c1757ee30587c0edf74c762a3d32b953|4069627", + "v2.1.121|linux_arm64|55cc5edd65be46758ed58d466f2ed88b70c2c22f144f0ecf9ac372b451ad304c|4072726", + "v2.1.121|linux_x86_64|55cc5edd65be46758ed58d466f2ed88b70c2c22f144f0ecf9ac372b451ad304c|4072726", + "v2.1.121|macos_arm64|55cc5edd65be46758ed58d466f2ed88b70c2c22f144f0ecf9ac372b451ad304c|4072726", + "v2.1.121|macos_x86_64|55cc5edd65be46758ed58d466f2ed88b70c2c22f144f0ecf9ac372b451ad304c|4072726", ] [pytest] # N.B.: Keep aligned with requirements.txt. -version = "pytest==7.2.0" +version = "pytest==7.2.1" lockfile = "pants-support/tool-locks/pytest.lock" [python] enable_resolves = true -interpreter_constraints = ["==3.10.*"] +interpreter_constraints = ["==3.11.*"] [python.resolves] python-default = "lock.json" +[python.resolves_to_interpreter_constraints] +# This non-DRY re-declaration of the default IC above is bugged here: +# https://github.com/pantsbuild/pants/issues/17978 +python-default = ["==3.11.*"] + [source] root_patterns = [ "/" diff --git a/pyproject.toml b/pyproject.toml index aa43ae1..bad4d04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 100 -target-version = ["py310"] +target-version = ["py311"] [tool.isort] profile = "black" diff --git a/requirements.txt b/requirements.txt index e3416d5..8756b03 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,9 +5,8 @@ httpx packaging # N.B.: Keep this aligned with pants.toml -pytest==7.2.0 +pytest==7.2.1 -tomli tqdm types-appdirs types-tqdm \ No newline at end of file diff --git a/science.toml b/science.toml index 9e2581b..224a90f 100644 --- a/science.toml +++ b/science.toml @@ -23,7 +23,7 @@ lazy = true # release = "20221220" # Can be exact, e.g.: 3.10.9; otherwise finds matching artifacts. -version = "3.10" +version = "3.11" # Optional, defaults to the "install_only" flavor. # flavor = "install_only" diff --git a/science/BUILD b/science/BUILD index 0987714..f89dd9a 100644 --- a/science/BUILD +++ b/science/BUILD @@ -5,11 +5,4 @@ pex_binary( entry_point="__main__.py", execution_mode="venv", output_path="science.pex", - platforms=[ - "linux_aarch64-cp-310-cp310", - "linux_x86_64-cp-310-cp310", - "macosx_10_9_arm64-cp-310-cp310", - "macosx_10_9_x86_64-cp-310-cp310", - "win_amd64-cp-310-cp310", - ] ) \ No newline at end of file diff --git a/science/config.py b/science/config.py index e888131..617344b 100644 --- a/science/config.py +++ b/science/config.py @@ -1,11 +1,12 @@ # Copyright 2022 Science project contributors. # Licensed under the Apache License, Version 2.0 (see LICENSE). +# This `no-infer-dep` will not be needed once we upgrade ti a version of Pants that fixes: +# https://github.com/pantsbuild/pants/issues/18055 +import tomllib # pants: no-infer-dep from pathlib import Path from typing import Any, Mapping -import tomli - from science.frozendict import FrozenDict from science.model import ( Application, @@ -25,11 +26,11 @@ def parse_config_file(path: Path) -> Application: with path.open(mode="rb") as fp: - return parse_config_data(tomli.load(fp)) + return parse_config_data(tomllib.load(fp)) def parse_config_str(config: str) -> Application: - return parse_config_data(tomli.loads(config)) + return parse_config_data(tomllib.loads(config)) def parse_command(data: Mapping[str, Any]) -> Command: