Skip to content

Commit

Permalink
Merge pull request #683 from maresb/cleanup-grayskull
Browse files Browse the repository at this point in the history
minor: clean up vendored grayskull
  • Loading branch information
maresb authored Sep 8, 2024
2 parents 6bfb9b3 + cdfd958 commit 0a4fb1a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
6 changes: 6 additions & 0 deletions conda_lock/_vendor/grayskull/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions conda_lock/interfaces/vendored_grayskull.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from conda_lock._vendor.grayskull.strategy.parse_poetry_version import (
encode_poetry_version,
)


__all__ = ["encode_poetry_version"]
4 changes: 1 addition & 3 deletions conda_lock/src_parser/pyproject_toml.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@
from packaging.utils import canonicalize_name as canonicalize_pypi_name
from typing_extensions import Literal

from conda_lock._vendor.grayskull.strategy.parse_poetry_version import (
encode_poetry_version,
)
from conda_lock.common import get_in
from conda_lock.interfaces.vendored_grayskull import encode_poetry_version
from conda_lock.lookup import get_forward_lookup as get_lookup
from conda_lock.models.lock_spec import (
Dependency,
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ drop = [
"poetry/utils/shell.py",
"poetry/core/_vendor/six.py",
"poetry/core/_vendor/six.LICENSE",
'^grayskull\/(?!strategy$|strategy\/parse_poetry_version\.py$|strategy\/__init__\.py$).*$',
# Drop everything in grayskull/ except for the listed files:
# - __init__.py
# - strategy/parse_poetry_version.py
# - strategy/__init__.py
'^grayskull\/(?!__init__\.py$|strategy\/parse_poetry_version\.py$|strategy\/__init__\.py$)',
]
substitute = [
# simple substitution patch to fix conda.exports
Expand Down

0 comments on commit 0a4fb1a

Please sign in to comment.