From 8863fa08243420d7dc9561d91b1790c86717c5db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Aug 2024 01:35:35 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03) → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d?narHash=sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC%2Bx4%3D' (2024-08-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14) → 'github:NixOS/nixpkgs/36a9aeaaa17a2d4348498275f9fe530cd4f9e519?narHash=sha256-z4nw9HxkaXEn%2B5OT8ljLVL2oataHvAzUQ1LEi8Fp%2BSY%3D' (2024-08-21) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/b92afa1501ac73f1d745526adc4f89b527595f14?narHash=sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0%3D' (2024-07-14) → 'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a?narHash=sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc%3D' (2024-08-16) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5e42df1..ffa6bfe 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720955038, - "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", + "lastModified": 1724271409, + "narHash": "sha256-z4nw9HxkaXEn+5OT8ljLVL2oataHvAzUQ1LEi8Fp+SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", + "rev": "36a9aeaaa17a2d4348498275f9fe530cd4f9e519", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1720930114, - "narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b92afa1501ac73f1d745526adc4f89b527595f14", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { From bd26bb8daf2cab8aa7df96f7b7d6ce95eb7e54e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Aug 2024 13:02:17 +0200 Subject: [PATCH 2/3] fix format --- tests/direnv_project.py | 2 +- tests/root.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/direnv_project.py b/tests/direnv_project.py index 317ae27..1a2ac9e 100644 --- a/tests/direnv_project.py +++ b/tests/direnv_project.py @@ -31,7 +31,7 @@ class DirenvProject: 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 diff --git a/tests/root.py b/tests/root.py index a5bf399..b3f0914 100644 --- a/tests/root.py +++ b/tests/root.py @@ -6,7 +6,7 @@ TEST_ROOT = Path(__file__).parent.resolve() PROJECT_ROOT = TEST_ROOT.parent -@pytest.fixture() +@pytest.fixture def test_root() -> Path: """ Root directory of the tests @@ -14,7 +14,7 @@ def test_root() -> Path: return TEST_ROOT -@pytest.fixture() +@pytest.fixture def project_root() -> Path: """ Root directory of the tests From aecd3b38712160c1e42ec59fd321381b374ab3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Aug 2024 14:08:12 +0200 Subject: [PATCH 3/3] mergify: fix test name --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index f437305..0f99b85 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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