Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ $ uvx --from 'vcspull' --prerelease allow vcspull
_Notes on upcoming releases will be added here_
<!-- END PLACEHOLDER - ADD NEW CHANGELOG ENTRIES BELOW THIS LINE -->

### Development

- Track libvcs's `vcs_gitconfig` fixture rename
([libvcs#528](https://github.com/vcs-python/libvcs/issues/528),
[libvcs#529](https://github.com/vcs-python/libvcs/pull/529)). The
internal `setup()` autouse fixture in `conftest.py` and the
`test_home_contains_gitconfig` / `test_pytester_git_commit_in_isolated_run`
tests now request the renamed `vcs_gitconfig` parameter. Pinned to
`libvcs>=0.41.0,<0.42.0`; `[tool.uv.sources]` temporarily tracks the
libvcs branch until 0.41.0 ships.

### Documentation

- Bump gp-sphinx docs stack to v0.0.1a16 — docs site now renders
Expand Down
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def add_doctest_fixtures(
def setup(
request: pytest.FixtureRequest,
monkeypatch: pytest.MonkeyPatch,
gitconfig: pathlib.Path,
vcs_gitconfig: pathlib.Path,
set_home: pathlib.Path,
xdg_config_path: pathlib.Path,
git_commit_envvars: dict[str, str],
Expand Down
7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ keywords = [
]
homepage = "https://vcspull.git-pull.com"
dependencies = [
"libvcs>=0.40.0,<0.41.0",
"libvcs>=0.41.0,<0.42.0",
"colorama>=0.3.9",
"PyYAML>=6.0"
]
Expand Down Expand Up @@ -135,6 +135,11 @@ typings = [
requires = ["hatchling"]
build-backend = "hatchling.build"

[tool.uv.sources]
# Track libvcs's deconflict-with-pytest-gitconfig branch until 0.41.0 ships.
# Drop this section once libvcs 0.41.0 is on PyPI. See libvcs#528 / libvcs#529.
libvcs = { git = "https://github.com/vcs-python/libvcs", branch = "deconflict-with-pytest-gitconfig" }

[tool.uv.exclude-newer-package]
# vcspull's release cadence is tightly coupled to libvcs -- a libvcs
# release blocking on a 3-day cooldown blocks every contributor's
Expand Down
4 changes: 2 additions & 2 deletions tests/test_fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_git_commit_envvars_in_environment(

def test_home_contains_gitconfig(
set_home: pathlib.Path,
gitconfig: pathlib.Path,
vcs_gitconfig: pathlib.Path,
) -> None:
"""HOME should point to a directory containing .gitconfig."""
home = os.environ.get("HOME", "")
Expand Down Expand Up @@ -136,7 +136,7 @@ def test_pytester_git_commit_in_isolated_run(
def setup(
request: pytest.FixtureRequest,
monkeypatch: pytest.MonkeyPatch,
gitconfig: pathlib.Path,
vcs_gitconfig: pathlib.Path,
set_home: pathlib.Path,
git_commit_envvars: dict[str, str],
) -> None:
Expand Down
8 changes: 2 additions & 6 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.