Update vendoring process

conda · Sep 14, 2024 · 5288d79 · 5288d79
1 parent 76fa15d
commit 5288d79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/conda_lock/scripts/vendor_poetry/rerun_vendoring.sh b/conda_lock/scripts/vendor_poetry/rerun_vendoring.sh
@@ -23,15 +23,17 @@ vendoring sync -vvv .
 echo Fixing CRLF line endings...
 dos2unix conda_lock/_vendor/poetry/core/_vendor/lark/grammars/*
 dos2unix conda_lock/_vendor/poetry/core/_vendor/fastjsonschema/*
-dos2unix conda_lock/_vendor/conda/_vendor/boltons/LICENSE
 dos2unix conda_lock/_vendor/poetry/core/_vendor/lark/LICENSE
 
 echo Downloading missing licenses...
 for package in poetry poetry-core cleo; do
   curl -s "https://github.com/raw/python-poetry/${package}/master/LICENSE" > "conda_lock/_vendor/${package}.LICENSE"
 done
+curl -s "https://github.com/raw/conda/conda/master/LICENSE" > "conda_lock/_vendor/conda.LICENSE"
 
 echo Removing duplicate licenses...
+diff conda_lock/_vendor/conda/LICENSE.txt conda_lock/_vendor/conda/_vendor/frozendict/LICENSE.txt
+rm conda_lock/_vendor/conda/LICENSE.txt
 # This one is actually correct, but we downloaded it to poetry-core.LICENSE above.
 diff conda_lock/_vendor/poetry_core.LICENSE conda_lock/_vendor/poetry-core.LICENSE
 rm conda_lock/_vendor/poetry-core.LICENSE

diff --git a/pyproject.toml b/pyproject.toml
@@ -137,6 +137,8 @@ drop = [
     "poetry/utils/shell.py",
     "poetry/core/_vendor/six.py",
     "poetry/core/_vendor/six.LICENSE",
+    "tests",
+    "conda/shell",
     # Drop everything in grayskull/ except for the listed files:
     # - __init__.py
     # - strategy/__init__.py