Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multi-file version constraints #546

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Commits on Nov 14, 2023

  1. Support multi-file version constraints

    Until conda/conda#11612 is resolved we do a
    simplified version of combining build strings.
    
    This is a change in behavior as previously package version constraings
    would simply be overwritten instead of combined.
    knedlsepp committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    2dc54e9 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. Split up _merge_matchspecs

    knedlsepp committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    d6c4873 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    19436cb View commit details
    Browse the repository at this point in the history
  3. Simplify aggregation

    We need to keep the "# type: ignore" because otherwise we get the
    following error in mypy:
    
    - conda_lock/src_parser/aggregation.py:42: error: Argument 1 to "merge"
      of "VersionedDependency" has incompatible type "VersionedDependency |
      URLDependency | VCSDependency | None"; expected "VersionedDependency |
      None"  [arg-type]
    - conda_lock/src_parser/aggregation.py:42: error: Argument 1 to "merge"
      of "URLDependency" has incompatible type "VersionedDependency |
      URLDependency | VCSDependency | None"; expected "URLDependency | None"
      [arg-type]
    - conda_lock/src_parser/aggregation.py:42: error: Argument 1 to "merge"
      of "VCSDependency" has incompatible type "VersionedDependency |
      URLDependency | VCSDependency | None"; expected "VCSDependency | None"
      [arg-type]
    knedlsepp committed Nov 25, 2023
    Configuration menu
    Copy the full SHA
    1eafa23 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8379271 View commit details
    Browse the repository at this point in the history