-
Notifications
You must be signed in to change notification settings - Fork 71
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
feat: Read plugin version from distribution, with fallback to package #1254
Closed
Closed
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
1a28cbb
get version from distribution
a0542fa
fix annotations bug
c789633
mypy
4a35cf3
add test
699d94b
update test candidate
51040fc
update docstring
ca93070
windows returns multiple site-package dirs
82c4cdf
xfail windows
14ad687
fix __file__ lookup
abaf4aa
Merge branch 'main' into kgpayne/missing-version-on-about-variant-bug
67ce949
xfail windows
17a64b9
Merge branch 'main' into kgpayne/missing-version-on-about-variant-bug
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import platform | ||
import site | ||
from pathlib import Path | ||
|
||
import pytest | ||
|
||
from singer_sdk.helpers._compat import get_project_distribution, metadata | ||
|
||
|
||
def test_get_project_distribution(): | ||
"""Test `get_project_distribution()`. | ||
|
||
click is a representative example of a distributed package from our dependency tree. | ||
Any similar singer_sdk dependency could be used in stead. | ||
""" | ||
if platform.system() == "Windows": | ||
pytest.xfail("Doesn't pass on windows.") | ||
|
||
site_package_paths = site.getsitepackages() | ||
site_package_path = next( | ||
pth for pth in site_package_paths if Path(pth).parts[-1] == "site-packages" | ||
) | ||
singer_sdk_dependency_path = Path(site_package_path) / "click" / "__init__.py" | ||
discovered_dst = get_project_distribution(singer_sdk_dependency_path) | ||
assert discovered_dst | ||
assert discovered_dst.name == "click" |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this mean the package name can't be retrieved in Windows?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It means the lookup via distribution will not work, yes. The fallback to
metadata.version(cls.name)
was the primary mechanism before this change (it relies on the library name being the same as the class name), though I don't know how well it worked for Windows in the first place 🤔Given the hurdles we have to jump through to try and infer the plugin version via distribution or library metadata, I still think we are better off adding
__version__ = "<version>"
in__init__.py
and importing that for--about
.poetry-dynamic-versioning
supports substitution from a0.0.0
placeholder in any file (including__init__.py
by default), and this approach is standard in other python packages 🤷♂️ This PR specifically addresses this ask from @aaronsteers 👍There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kgpayne Yeah, I'd say it's probably not worth spending time trying to solve a problem that's only present when migrating existing taps and targets that are published to PyPI. Wdyt?