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.

Sign up for GitHub

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

Jump to bottom

Simplify vendoring and declare dependencies optionally #4457

Merged
merged 29 commits into from
Jul 17, 2024
Merged

Simplify vendoring and declare dependencies optionally #4457

merged 29 commits into from
Jul 17, 2024

Commits on Jul 3, 2024

  1. Declare the dependencies and update vendoring routine for setuptools … 

    …(only) to simply install the dependencies to the _vendor folder.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    62bd80f View commit details
    Browse the repository at this point in the history

  2. Specify environment-conditional transitive deps. 

    Workaround for pypa/pip#12770.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    e9bb687 View commit details
    Browse the repository at this point in the history

  3. Import dependencies naturally and ensure they're available by appendi… 

    …ng the vendor dir to sys.path.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    d4352b5 View commit details
    Browse the repository at this point in the history

  4. Re-vendor setuptools packages.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    00384a5 View commit details
    Browse the repository at this point in the history

  5. Remove importlib_metadata workaround.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    3ed7e27 View commit details
    Browse the repository at this point in the history

  6. Remove setuptools.extern

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    f21bcab View commit details
    Browse the repository at this point in the history

  7. Remove check-extern env in tox.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    bd5cf00 View commit details
    Browse the repository at this point in the history

  8. Update vendoring routine for pkg_resources to simply install the depe… 

    …ndencies to the _vendor folder.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    9234fc3 View commit details
    Browse the repository at this point in the history

  9. Import dependencies naturally and ensure they're available by appendi… 

    …ng the vendor dir to sys.path.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    d03cd0e View commit details
    Browse the repository at this point in the history

  10. Re-vendor pkg_resources packages.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    c6913bf View commit details
    Browse the repository at this point in the history

  11. Remove obsolete 'rewrite' functionality from vendored script.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    51615db View commit details
    Browse the repository at this point in the history

  12. Update auto-detect the minimum python version needed for vendored pac… 

    …kages.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    b4b6bf7 View commit details
    Browse the repository at this point in the history

  13. Refresh vendored dependencies.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    4f6d973 View commit details
    Browse the repository at this point in the history

  14. Consolidate vendored packages in the setuptools package. 

    Now that the vendoring doesn't depend on importing the setuptools package, it's safe for pkg_resources to import _from_ there without actually importing setuptools.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8b4b9d0 View commit details
    Browse the repository at this point in the history

  15. Remove pkg_resources.extern.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    1523957 View commit details
    Browse the repository at this point in the history

  16. Clean up references to extern modules.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    c4086b9 View commit details
    Browse the repository at this point in the history

  17. Add news fragment.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ed15a3b View commit details
    Browse the repository at this point in the history

  18. Suppress type errors around wheel.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    cb4b670 View commit details
    Browse the repository at this point in the history

  19. Fix type error in vendored tool.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    e7c320b View commit details
    Browse the repository at this point in the history

  20. Fix incorrect type declaration in _python_requires.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    3fd66b9 View commit details
    Browse the repository at this point in the history

  21. Fix type errors in pkg_resources, now that packaging types are recogn… 

    …ized properly.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    bb17215 View commit details
    Browse the repository at this point in the history

  22. Suppress coverage errors.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    242ef24 View commit details
    Browse the repository at this point in the history

  23. Moved the dependencies to a 'core' extra to avoid dangers with cyclic… 

    … dependencies at build time.
    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    d25f6d9 View commit details
    Browse the repository at this point in the history

  24. Ensure that package data from vendored packages gets installed.

    @jaraco
    jaraco committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    fa7ee91 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Explicitly declare the 'core' extra as 'for informational purposes'

    @jaraco
    jaraco committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    a2a64ec View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Rewrite marker evaluation to address two type check failures. 

    1. The early `req.marker` works around a limitation that mypy can't detect that `not req.marker` is evaluated prior to entering the generator.

2. The `None` → `""` honors the type spec (`dict-item`) and avoids relying on the [deprecated code path](https://github.com/pypa/packaging/blob/793ee28b4c70886e8de5731e24e444388916b3ee/src/packaging/markers.py#L322-L323) allowing `None`.
    @Avasam @jaraco
    Avasam authored and jaraco committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    225f7fe View commit details
    Browse the repository at this point in the history

  2. Update Requirement.__contains__ type spec to accept UnparsedVersion.

    @Avasam @jaraco
    Avasam authored and jaraco committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0e1e707 View commit details
    Browse the repository at this point in the history

  3. Rely on os.path.join and os.path.dirname when adding the vendored pat… 

    …h and only add it if it's not already present.
    @jaraco
    jaraco committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    930ebe5 View commit details
    Browse the repository at this point in the history

  4. Resolve a version from an item, addressing missed arg-type check.

    @jaraco
    jaraco committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    9eb89de View commit details
    Browse the repository at this point in the history