-
-
Notifications
You must be signed in to change notification settings - Fork 222
Make Mercurial command configurable by an environment variable #1144
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
Open
manueljacob
wants to merge
2
commits into
pypa:main
Choose a base branch
from
manueljacob:hg_command
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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,4 @@ | ||
### Added | ||
|
||
- make Mercurial command configurable by environment variable `SETUPTOOLS_SCM_HG_COMMAND` | ||
|
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
@@ -1,9 +1,16 @@ | ||
from __future__ import annotations | ||
|
||
import importlib | ||
|
||
import pytest | ||
|
||
from setuptools_scm import Configuration | ||
from setuptools_scm import hg | ||
from setuptools_scm import hg_git | ||
from setuptools_scm._run_cmd import CommandNotFoundError | ||
from setuptools_scm._run_cmd import has_command | ||
from setuptools_scm._run_cmd import run | ||
from setuptools_scm.hg import parse | ||
from testing.wd_wrapper import WorkDir | ||
|
||
|
||
|
@@ -81,3 +88,34 @@ def test_base(repositories_hg_git: tuple[WorkDir, WorkDir]) -> None: | |
wd("hg pull -u") | ||
assert wd_git.get_version() == "17.33.0rc0" | ||
assert wd.get_version() == "17.33.0rc0" | ||
|
||
|
||
def test_hg_gone( | ||
repositories_hg_git: tuple[WorkDir, WorkDir], monkeypatch: pytest.MonkeyPatch | ||
) -> None: | ||
wd = repositories_hg_git[0] | ||
monkeypatch.setenv("PATH", str(wd.cwd / "not-existing")) | ||
config = Configuration() | ||
wd.write("pyproject.toml", "[tool.setuptools_scm]") | ||
with pytest.raises(CommandNotFoundError, match=r"hg"): | ||
parse(wd.cwd, config=config) | ||
|
||
assert wd.get_version(fallback_version="1.0") == "1.0" | ||
|
||
|
||
def test_hg_command_from_env( | ||
repositories_hg_git: tuple[WorkDir, WorkDir], | ||
monkeypatch: pytest.MonkeyPatch, | ||
request: pytest.FixtureRequest, | ||
hg_exe: str, | ||
) -> None: | ||
wd = repositories_hg_git[0] | ||
with monkeypatch.context() as m: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Instead of reloading rhe modules lets turn the logic into a function the test can call |
||
m.setenv("SETUPTOOLS_SCM_HG_COMMAND", hg_exe) | ||
m.setenv("PATH", str(wd.cwd / "not-existing")) | ||
request.addfinalizer(lambda: importlib.reload(hg)) | ||
request.addfinalizer(lambda: importlib.reload(hg_git)) | ||
importlib.reload(hg) | ||
importlib.reload(hg_git) | ||
wd.write("pyproject.toml", "[tool.setuptools_scm]") | ||
assert wd.get_version().startswith("0.1.dev0+") |
This file contains hidden or 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
Oops, something went wrong.
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.
Let's turn this into a module import to ease test instrumentation