feat: bump pep crates in rattler (#918)

conda · Nov 4, 2024 · a8d5804 · a8d5804
1 parent ce3ed53
commit a8d5804
Show file tree

Hide file tree

Showing 8 changed files with 392 additions and 598 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -99,8 +99,8 @@ once_cell = "1.20.2"
 ouroboros = "0.18.4"
 parking_lot = "0.12.3"
 pathdiff = "0.2.2"
-pep440_rs = { version = "0.6.6" }
-pep508_rs = { version = "0.6.1" }
+pep440_rs = { version = "0.7.2" }
+pep508_rs = { version = "0.9.1" }
 percent-encoding = "2.3.1"
 pin-project-lite = "0.2.15"
 plist = "1"

diff --git a/crates/rattler_lock/Cargo.toml b/crates/rattler_lock/Cargo.toml
@@ -18,8 +18,8 @@ itertools = { workspace = true }
 rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.3", default-features = false }
 rattler_digest = { path = "../rattler_digest", version = "1.0.2", default-features = false }
 file_url = { path = "../file_url", version = "0.1.6" }
-pep508_rs = { workspace = true, features = ["serde"] }
-pep440_rs = { workspace = true, features = ["serde"] }
+pep508_rs = { workspace = true }
+pep440_rs = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_yaml = { workspace = true }
 serde_with = { workspace = true, features = ["indexmap_2"] }

diff --git a/...es/rattler_lock/src/snapshots/rattler_lock__test__v0__pypi-matplotlib-conda-lock.yml.snap b/...es/rattler_lock/src/snapshots/rattler_lock__test__v0__pypi-matplotlib-conda-lock.yml.snap
@@ -316,45 +316,45 @@ packages:
     url: "https://files.pythonhosted.org/packages/07/2e/0122487af85f542f8d65a883b6470f044ddb9d0159c95488a6747314d231/matplotlib-3.5.1-cp39-cp39-macosx_10_9_x86_64.whl"
     sha256: edf5e4e1d5fb22c18820e8586fb867455de3b109c309cb4fce3aaed85d9468d1
     requires_dist:
-      - cycler >=0.10
-      - fonttools >=4.22.0
-      - kiwisolver >=1.0.1
-      - numpy >=1.17
-      - packaging >=20.0
-      - pillow >=6.2.0
-      - pyparsing >=2.2.1
-      - python-dateutil >=2.7
-      - setuptools-scm >=4
+      - cycler>=0.10
+      - fonttools>=4.22.0
+      - kiwisolver>=1.0.1
+      - numpy>=1.17
+      - packaging>=20.0
+      - pillow>=6.2.0
+      - pyparsing>=2.2.1
+      - python-dateutil>=2.7
+      - setuptools-scm>=4
   - kind: pypi
     name: matplotlib
     version: 3.5.1
     url: "https://files.pythonhosted.org/packages/6a/52/703f568256a3e614a448503a698557d7832b7893fd63d3f7c2ebb54cd6e2/matplotlib-3.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl"
     sha256: 87900c67c0f1728e6db17c6809ec05c025c6624dcf96a8020326ea15378fe8e7
     requires_dist:
-      - cycler >=0.10
-      - fonttools >=4.22.0
-      - kiwisolver >=1.0.1
-      - numpy >=1.17
-      - packaging >=20.0
-      - pillow >=6.2.0
-      - pyparsing >=2.2.1
-      - python-dateutil >=2.7
-      - setuptools-scm >=4
+      - cycler>=0.10
+      - fonttools>=4.22.0
+      - kiwisolver>=1.0.1
+      - numpy>=1.17
+      - packaging>=20.0
+      - pillow>=6.2.0
+      - pyparsing>=2.2.1
+      - python-dateutil>=2.7
+      - setuptools-scm>=4
   - kind: pypi
     name: matplotlib
     version: 3.5.1
     url: "https://files.pythonhosted.org/packages/86/cd/619a45613393293117297f2f0e5086a619e1ea98c5e2ce6d0f554ddc97c3/matplotlib-3.5.1-cp39-cp39-win_amd64.whl"
     sha256: fe8d40c434a8e2c68d64c6d6a04e77f21791a93ff6afe0dce169597c110d3079
     requires_dist:
-      - cycler >=0.10
-      - fonttools >=4.22.0
-      - kiwisolver >=1.0.1
-      - numpy >=1.17
-      - packaging >=20.0
-      - pillow >=6.2.0
-      - pyparsing >=2.2.1
-      - python-dateutil >=2.7
-      - setuptools-scm >=4
+      - cycler>=0.10
+      - fonttools>=4.22.0
+      - kiwisolver>=1.0.1
+      - numpy>=1.17
+      - packaging>=20.0
+      - pillow>=6.2.0
+      - pyparsing>=2.2.1
+      - python-dateutil>=2.7
+      - setuptools-scm>=4
   - kind: conda
     name: ncurses
     version: "6.3"
@@ -427,7 +427,7 @@ packages:
     url: "https://files.pythonhosted.org/packages/05/8e/8de486cbd03baba4deef4142bd643a3e7bbe954a784dc1bb17142572d127/packaging-21.3-py3-none-any.whl"
     sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
     requires_dist:
-      - "pyparsing !=3.0.5, >=2.0.2"
+      - "pyparsing>=2.0.2,!=3.0.5"
   - kind: pypi
     name: pillow
     version: 9.0.1
@@ -554,7 +554,7 @@ packages:
     url: "https://files.pythonhosted.org/packages/36/7a/87837f39d0296e723bb9b62bbb257d0355c7f6128853c78955f57342a56d/python_dateutil-2.8.2-py2.py3-none-any.whl"
     sha256: 961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
     requires_dist:
-      - six >=1.5
+      - six>=1.5
   - kind: conda
     name: python_abi
     version: "3.9"
@@ -645,8 +645,8 @@ packages:
     url: "https://files.pythonhosted.org/packages/e3/e5/c28b544051340e63e0d507eb893c9513d3a300e5e9183e2990518acbfe36/setuptools_scm-6.4.2-py3-none-any.whl"
     sha256: acea13255093849de7ccb11af9e1fb8bde7067783450cee9ef7a93139bddf6d4
     requires_dist:
-      - packaging >=20.0
-      - tomli >=1.0.0
+      - packaging>=20.0
+      - tomli>=1.0.0
   - kind: pypi
     name: six
     version: 1.16.0

diff --git a/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__path-based-lock.yml.snap b/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__path-based-lock.yml.snap
@@ -95,26 +95,26 @@ packages:
     url: "direct+https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl"
     requires_dist:
       - "colorama ; platform_system == 'Windows'"
-      - "importlib-metadata ; python_version < '3.8'"
+      - "importlib-metadata ; python_full_version < '3.8'"
     requires_python: ">=3.7"
   - kind: pypi
     name: colorama
     version: 0.4.6
     url: "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl"
     sha256: 4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-    requires_python: "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+    requires_python: ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
   - kind: pypi
     name: flask
     version: 3.0.2
     url: "git+ssh://[email protected]/pallets/flask@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe"
     requires_dist:
-      - werkzeug >=3.0.0
-      - jinja2 >=3.1.2
-      - itsdangerous >=2.1.2
-      - click >=8.1.3
-      - blinker >=1.6.2
-      - "importlib-metadata >=3.6.0 ; python_version < '3.10'"
-      - "asgiref >=3.2 ; extra == 'async'"
+      - werkzeug>=3.0.0
+      - jinja2>=3.1.2
+      - itsdangerous>=2.1.2
+      - click>=8.1.3
+      - blinker>=1.6.2
+      - "importlib-metadata>=3.6.0 ; python_full_version < '3.10'"
+      - "asgiref>=3.2 ; extra == 'async'"
       - "python-dotenv ; extra == 'dotenv'"
     requires_python: ">=3.8"
   - kind: pypi
@@ -135,8 +135,8 @@ packages:
     url: "https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl"
     sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
     requires_dist:
-      - markupsafe >=2.0
-      - "babel >=2.7 ; extra == 'i18n'"
+      - markupsafe>=2.0
+      - "babel>=2.7 ; extra == 'i18n'"
     requires_python: ">=3.7"
   - kind: conda
     name: libexpat
@@ -208,17 +208,17 @@ packages:
     url: "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl"
     sha256: 355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1
     requires_dist:
-      - mdurl ~=0.1
+      - mdurl~=0.1
       - "psutil ; extra == 'benchmarking'"
       - "pytest ; extra == 'benchmarking'"
       - "pytest-benchmark ; extra == 'benchmarking'"
-      - "pre-commit ~=3.0 ; extra == 'code_style'"
-      - "commonmark ~=0.9 ; extra == 'compare'"
-      - "markdown ~=3.4 ; extra == 'compare'"
-      - "mistletoe ~=1.0 ; extra == 'compare'"
-      - "mistune ~=2.0 ; extra == 'compare'"
-      - "panflute ~=2.3 ; extra == 'compare'"
-      - "linkify-it-py >=1, <3 ; extra == 'linkify'"
+      - "pre-commit~=3.0 ; extra == 'code-style'"
+      - "commonmark~=0.9 ; extra == 'compare'"
+      - "markdown~=3.4 ; extra == 'compare'"
+      - "mistletoe~=1.0 ; extra == 'compare'"
+      - "mistune~=2.0 ; extra == 'compare'"
+      - "panflute~=2.3 ; extra == 'compare'"
+      - "linkify-it-py>=1,<3 ; extra == 'linkify'"
       - "mdit-py-plugins ; extra == 'plugins'"
       - "gprof2dot ; extra == 'profiling'"
       - "mdit-py-plugins ; extra == 'rtd'"
@@ -277,8 +277,8 @@ packages:
     url: "https://files.pythonhosted.org/packages/97/9c/372fef8377a6e340b1704768d20daaded98bf13282b5327beb2e2fe2c7ef/pygments-2.17.2-py3-none-any.whl"
     sha256: b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c
     requires_dist:
-      - "importlib-metadata ; python_version < '3.8' and extra == 'plugins'"
-      - "colorama >=0.4.6 ; extra == 'windows-terminal'"
+      - "importlib-metadata ; python_full_version < '3.8' and extra == 'plugins'"
+      - "colorama>=0.4.6 ; extra == 'windows-terminal'"
     requires_python: ">=3.7"
   - kind: conda
     name: python
@@ -311,23 +311,23 @@ packages:
     version: 2.31.0
     url: "git+https://github.com/psf/requests.git@0106aced5faa299e6ede89d1230bd6784f2c3660"
     requires_dist:
-      - "charset-normalizer <4, >=2"
-      - "idna <4, >=2.5"
-      - "urllib3 <3, >=1.21.1"
-      - certifi >=2017.4.17
-      - "pysocks !=1.5.7, >=1.5.6 ; extra == 'socks'"
-      - "chardet <6, >=3.0.2 ; extra == 'use_chardet_on_py3'"
+      - "charset-normalizer>=2,<4"
+      - "idna>=2.5,<4"
+      - "urllib3>=1.21.1,<3"
+      - certifi>=2017.4.17
+      - "pysocks>=1.5.6,!=1.5.7 ; extra == 'socks'"
+      - "chardet>=3.0.2,<6 ; extra == 'use-chardet-on-py3'"
     requires_python: ">=3.7"
   - kind: pypi
     name: rich
     version: 13.7.1
     url: "https://files.pythonhosted.org/packages/87/67/a37f6214d0e9fe57f6ae54b2956d550ca8365857f42a1ce0392bb21d9410/rich-13.7.1-py3-none-any.whl"
     sha256: 4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222
     requires_dist:
-      - "ipywidgets >=7.5.1, <9 ; extra == 'jupyter'"
-      - markdown-it-py >=2.2.0
-      - "pygments >=2.13.0, <3.0.0"
-      - "typing-extensions >=4.0.0, <5.0 ; python_version < '3.9'"
+      - "ipywidgets>=7.5.1,<9 ; extra == 'jupyter'"
+      - markdown-it-py>=2.2.0
+      - "pygments>=2.13.0,<3.0.0"
+      - "typing-extensions>=4.0.0,<5.0 ; python_full_version < '3.9'"
     requires_python: ">=3.7.0"
   - kind: conda
     name: tk
@@ -378,11 +378,11 @@ packages:
     url: "https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl"
     sha256: 450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d
     requires_dist:
-      - "brotli >=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli'"
-      - "brotlicffi >=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli'"
-      - "h2 <5, >=4 ; extra == 'h2'"
-      - "pysocks !=1.5.7, <2.0, >=1.5.6 ; extra == 'socks'"
-      - "zstandard >=0.18.0 ; extra == 'zstd'"
+      - "brotli>=1.0.9 ; platform_python_implementation == 'CPython' and extra == 'brotli'"
+      - "brotlicffi>=0.8.0 ; platform_python_implementation != 'CPython' and extra == 'brotli'"
+      - "h2>=4,<5 ; extra == 'h2'"
+      - "pysocks>=1.5.6,!=1.5.7,<2.0 ; extra == 'socks'"
+      - "zstandard>=0.18.0 ; extra == 'zstd'"
     requires_python: ">=3.8"
   - kind: conda
     name: vc
@@ -439,8 +439,8 @@ packages:
     url: "https://files.pythonhosted.org/packages/c3/fc/254c3e9b5feb89ff5b9076a23218dafbc99c96ac5941e900b71206e6313b/werkzeug-3.0.1-py3-none-any.whl"
     sha256: 90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10
     requires_dist:
-      - markupsafe >=2.1.1
-      - "watchdog >=2.3 ; extra == 'watchdog'"
+      - markupsafe>=2.1.1
+      - "watchdog>=2.3 ; extra == 'watchdog'"
     requires_python: ">=3.8"
   - kind: conda
     name: xz

diff --git a/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__pypi-matplotlib-lock.yml.snap b/crates/rattler_lock/src/snapshots/rattler_lock__test__v4__pypi-matplotlib-lock.yml.snap
@@ -316,45 +316,45 @@ packages:
     url: "https://files.pythonhosted.org/packages/07/2e/0122487af85f542f8d65a883b6470f044ddb9d0159c95488a6747314d231/matplotlib-3.5.1-cp39-cp39-macosx_10_9_x86_64.whl"
     sha256: edf5e4e1d5fb22c18820e8586fb867455de3b109c309cb4fce3aaed85d9468d1
     requires_dist:
-      - cycler >=0.10
-      - fonttools >=4.22.0
-      - kiwisolver >=1.0.1
-      - numpy >=1.17
-      - packaging >=20.0
-      - pillow >=6.2.0
-      - pyparsing >=2.2.1
-      - python-dateutil >=2.7
-      - setuptools-scm >=4
+      - cycler>=0.10
+      - fonttools>=4.22.0
+      - kiwisolver>=1.0.1
+      - numpy>=1.17
+      - packaging>=20.0
+      - pillow>=6.2.0
+      - pyparsing>=2.2.1
+      - python-dateutil>=2.7
+      - setuptools-scm>=4
   - kind: pypi
     name: matplotlib
     version: 3.5.1
     url: "https://files.pythonhosted.org/packages/6a/52/703f568256a3e614a448503a698557d7832b7893fd63d3f7c2ebb54cd6e2/matplotlib-3.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl"
     sha256: 87900c67c0f1728e6db17c6809ec05c025c6624dcf96a8020326ea15378fe8e7
     requires_dist:
-      - cycler >=0.10
-      - fonttools >=4.22.0
-      - kiwisolver >=1.0.1
-      - numpy >=1.17
-      - packaging >=20.0
-      - pillow >=6.2.0
-      - pyparsing >=2.2.1
-      - python-dateutil >=2.7
-      - setuptools-scm >=4
+      - cycler>=0.10
+      - fonttools>=4.22.0
+      - kiwisolver>=1.0.1
+      - numpy>=1.17
+      - packaging>=20.0
+      - pillow>=6.2.0
+      - pyparsing>=2.2.1
+      - python-dateutil>=2.7
+      - setuptools-scm>=4
   - kind: pypi
     name: matplotlib
     version: 3.5.1
     url: "https://files.pythonhosted.org/packages/86/cd/619a45613393293117297f2f0e5086a619e1ea98c5e2ce6d0f554ddc97c3/matplotlib-3.5.1-cp39-cp39-win_amd64.whl"
     sha256: fe8d40c434a8e2c68d64c6d6a04e77f21791a93ff6afe0dce169597c110d3079
     requires_dist:
-      - cycler >=0.10
-      - fonttools >=4.22.0
-      - kiwisolver >=1.0.1
-      - numpy >=1.17
-      - packaging >=20.0
-      - pillow >=6.2.0
-      - pyparsing >=2.2.1
-      - python-dateutil >=2.7
-      - setuptools-scm >=4
+      - cycler>=0.10
+      - fonttools>=4.22.0
+      - kiwisolver>=1.0.1
+      - numpy>=1.17
+      - packaging>=20.0
+      - pillow>=6.2.0
+      - pyparsing>=2.2.1
+      - python-dateutil>=2.7
+      - setuptools-scm>=4
   - kind: conda
     name: ncurses
     version: "6.3"
@@ -427,7 +427,7 @@ packages:
     url: "https://files.pythonhosted.org/packages/05/8e/8de486cbd03baba4deef4142bd643a3e7bbe954a784dc1bb17142572d127/packaging-21.3-py3-none-any.whl"
     sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
     requires_dist:
-      - "pyparsing !=3.0.5, >=2.0.2"
+      - "pyparsing>=2.0.2,!=3.0.5"
   - kind: pypi
     name: pillow
     version: 9.0.1
@@ -554,7 +554,7 @@ packages:
     url: "https://files.pythonhosted.org/packages/36/7a/87837f39d0296e723bb9b62bbb257d0355c7f6128853c78955f57342a56d/python_dateutil-2.8.2-py2.py3-none-any.whl"
     sha256: 961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9
     requires_dist:
-      - six >=1.5
+      - six>=1.5
   - kind: conda
     name: python_abi
     version: "3.9"
@@ -645,8 +645,8 @@ packages:
     url: "https://files.pythonhosted.org/packages/e3/e5/c28b544051340e63e0d507eb893c9513d3a300e5e9183e2990518acbfe36/setuptools_scm-6.4.2-py3-none-any.whl"
     sha256: acea13255093849de7ccb11af9e1fb8bde7067783450cee9ef7a93139bddf6d4
     requires_dist:
-      - packaging >=20.0
-      - tomli >=1.0.0
+      - packaging>=20.0
+      - tomli>=1.0.0
   - kind: pypi
     name: six
     version: 1.16.0