Replace pkg_resources by importlib.metadata #766
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
graingert
reviewed
Sep 4, 2023
graingert
reviewed
Sep 4, 2023
graingert
reviewed
Sep 4, 2023
catkin_tools/commands/catkin.py
Outdated
| @@ -184,7 +196,7 @@ def catkin_main(sysargs): | |||
| # Check for version | |||
| if '--version' in sysargs: | |||
| print('catkin_tools {} (C) 2014-{} Open Source Robotics Foundation'.format( | |||
| pkg_resources.get_distribution('catkin_tools').version, | |||
| distribution('catkin_tools').version, | |||
There was a problem hiding this comment.
there's importlib.metadata.version as a shortcut for this
|
I have a PR that fixes the deprecation warnings: #767 |
not needed as only python>=3.8 is supported
|
So the select isn't available on 3.8 and 3.9.. I wil fix it later. And maybe #767 is better. But it lacks the single call to entry_points for now. |
It uses functools.lru_cache to do a single call |
But only for the verb entry points, in this PR there is a single call to entry_points for all groups combined |
|
This PR also does multiple calls for now. But we should combine the code regarding it of this PR and #767 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pkg_resourcesis deprecated and was causing issues in finding dependencies ofcatkin_tools_document.I replaced it by
importlib.metadata. I am not 100% sure the changes incatkin_tools/metadata.pyare correct.The call on
entry_points()is expensive, therefore I added a private function in combination with a global variable. I only applied this in thecommands/catkin.py. Ideally this is shared between files. Please let me know when you have suggestion to it a bit more cleanly and share it between the files.