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

Remove calls to distribution and legacy zip support from package util #107427

Merged
merged 1 commit into from Jan 7, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Jan 7, 2024

Proposed change

In #97628 pkg_resources was replaced with importlib.metadata and everything was tried with importlib.metadata.distribution first, but since is_installed actually gets requirements specifiers, it would always exception with PackageNotFoundError and fall through to be parsed with Requirement.

Remove the code that always exceptions.

This also removes the old zip file support as it likely has not been used for years

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

In #97628 pkg_resources was replaced with importlib.metadata and everything
was tried with importlib.metadata.distribution first, but since is_installed
actually gets requirements specifiers, it would always fail with PackageNotFoundError
and fall through to be parsed with Requirement

This also removes the old zip file support as it likely has not been used for
years
@home-assistant home-assistant bot added cla-signed code-quality core small-pr PRs with less than 30 lines. labels Jan 7, 2024
Returns True when the requirement is met.
Returns False when the package is not installed or doesn't meet req.
"""
try:
distribution(package)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bdraco bdraco marked this pull request as ready for review January 7, 2024 03:15
@bdraco bdraco requested a review from a team as a code owner January 7, 2024 03:15
Copy link
Member

@jpbede jpbede left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from my side, tested this with a fresh dev instance 👍

@bdraco
Copy link
Member Author

bdraco commented Jan 7, 2024

thanks

@bdraco bdraco merged commit 75d5915 into dev Jan 7, 2024
53 checks passed
@bdraco bdraco deleted the package_loader branch January 7, 2024 17:39
mkmer pushed a commit to mkmer/HomeAssistant_Core that referenced this pull request Jan 8, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Jan 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants