Skip to content

Commit

Permalink
Merge pull request #508 from nix-community/update_flake_lock_action
Browse files Browse the repository at this point in the history
flake.lock: Update
  • Loading branch information
Mic92 authored Aug 22, 2024
2 parents 3821242 + aecd3b3 commit 7272fa9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ queue_rules:
merge_conditions:
- check-success=buildbot/nix-eval
- check-success=tests (ubuntu-latest, stable)
- check-success=tests (ubuntu-latest, unstable)
- check-success=tests (ubuntu-latest, latest)
- check-success=tests (ubuntu-latest, bash4)
batch_size: 5
merge_method: rebase
Expand Down
18 changes: 9 additions & 9 deletions flake.lock

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

2 changes: 1 addition & 1 deletion tests/direnv_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def setup_envrc(self, content: str, strict_env: bool) -> None:
run(["direnv", "allow"], cwd=self.directory)


@pytest.fixture()
@pytest.fixture
def direnv_project(test_root: Path, project_root: Path) -> Iterator[DirenvProject]:
"""
Setups a direnv test project
Expand Down
4 changes: 2 additions & 2 deletions tests/root.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
PROJECT_ROOT = TEST_ROOT.parent


@pytest.fixture()
@pytest.fixture
def test_root() -> Path:
"""
Root directory of the tests
"""
return TEST_ROOT


@pytest.fixture()
@pytest.fixture
def project_root() -> Path:
"""
Root directory of the tests
Expand Down

0 comments on commit 7272fa9

Please sign in to comment.