Skip to content
Merged
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
8 changes: 2 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ authors = [
dependencies = [
"click ~= 8.1.0; python_version == '3.8'",
"click ~= 8.1.0; python_version == '3.9'",
"click >= 8.1.0, < 8.5.0; python_version >= '3.10'",
"click >= 8.1.0, < 8.6.0; python_version >= '3.10'",
"click-option-group ~= 0.5.0",
"gitpython ~= 3.0",
"requests ~= 2.25",
Expand Down Expand Up @@ -75,7 +75,7 @@ docs = [
test = [
"coverage[toml] ~= 7.0",
"filelock ~= 3.15",
"flatdict ~= 4.0",
"cj365-flatdict ~= 5.0",
"freezegun ~= 1.5",
"pyyaml ~= 6.0",
"pytest >= 8.3, < 10.0",
Expand Down Expand Up @@ -208,10 +208,6 @@ plugins = ["pydantic.mypy"]
module = "tests.*"
disallow_untyped_defs = false

[[tool.mypy.overrides]]
module = "flatdict"
ignore_missing_imports = true

[[tool.mypy.overrides]]
module = "shellingham"
ignore_missing_imports = true
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/cmd_version/test_version_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pytest
import shellingham
import tomlkit
from flatdict import FlatDict
from cj365.flatdict import FlatDict
from pytest_lazy_fixtures.lazy_fixture import lf as lazy_fixture

from tests.const import MAIN_PROG_NAME, VERSION_SUBCMD
Expand Down
8 changes: 7 additions & 1 deletion tests/fixtures/monorepos/git_monorepo.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ def cached_example_git_monorepo(

def _build_repo(cached_repo_path: Path) -> Sequence[RepoActions]:
if not cached_example_monorepo.exists():
raise RuntimeError("Unable to find cached monorepo files")
msg = "Unable to find cached monorepo files"
raise RuntimeError(msg)

# make a copy of the example monorepo as a base
copy_dir_tree(cached_example_monorepo, cached_repo_path)
Expand All @@ -109,6 +110,11 @@ def _build_repo(cached_repo_path: Path) -> Sequence[RepoActions]:
config.set_value("commit", "gpgsign", False)
config.set_value("tag", "gpgsign", False)

# Disable automatic garbage collection and background maintenance to prevent race conditions
config.set_value("gc", "auto", 0)
config.set_value("gc", "autoDetach", "false")
config.set_value("maintenance", "auto", "false")

# set up a remote tracking branch for the default branch
config.set_value(f'branch "{DEFAULT_BRANCH_NAME}"', "remote", "origin")
config.set_value(
Expand Down
Loading