From 75e218533445695e7035930779a5d19798813b2b Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Sun, 29 Sep 2024 14:04:14 +0200 Subject: [PATCH 1/2] Vendor Grayskull from the official release Before I presumptuously vendored from my PR. Luckily my PR was merged. --- conda_lock/_vendor/vendor.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_lock/_vendor/vendor.txt b/conda_lock/_vendor/vendor.txt index fb86ee39..33c903d6 100644 --- a/conda_lock/_vendor/vendor.txt +++ b/conda_lock/_vendor/vendor.txt @@ -2,7 +2,7 @@ cleo==2.1.0 poetry==1.8.3 poetry-core==1.9.0 -git+https://github.com/maresb/grayskull.git@d367c1605f320bae345b441b81ba38f5f72dc17e +grayskull==2.7.3 # install conda from github git+https://github.com/conda/conda.git@24.7.1 From a57825f5f9f95dc994bcb0bc12e6487c75a8af24 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Sun, 29 Sep 2024 14:04:48 +0200 Subject: [PATCH 2/2] Explain why we're vendoring Conda from GH instead of PyPI --- conda_lock/_vendor/vendor.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_lock/_vendor/vendor.txt b/conda_lock/_vendor/vendor.txt index 33c903d6..b560d13c 100644 --- a/conda_lock/_vendor/vendor.txt +++ b/conda_lock/_vendor/vendor.txt @@ -4,5 +4,5 @@ poetry==1.8.3 poetry-core==1.9.0 grayskull==2.7.3 -# install conda from github +# install conda from github since it's not available on pypi git+https://github.com/conda/conda.git@24.7.1