Merge pull request #299 from GaetanLepage/clean

miscellaneous cleaning

default.nix

@@ -1,20 +1,21 @@
 {
   pkgs ? import <nixpkgs> { },
 }:
-
-pkgs.python3.pkgs.buildPythonApplication {
+pkgs.python3Packages.buildPythonApplication {
   pname = "nix-update";
   version = "1.5.2";
   src = ./.;
   pyproject = true;
   buildInputs = [ pkgs.makeWrapper ];
-  nativeBuildInputs = [ pkgs.python3.pkgs.setuptools ];
-  nativeCheckInputs = [
-    pkgs.python3.pkgs.pytest
-    # technically not test inputs, but we need it for development in PATH
+  build-system = [ pkgs.python3Packages.setuptools ];
+  nativeBuildInputs = [
     pkgs.nixVersions.stable
     pkgs.nix-prefetch-git
   ];
+  nativeCheckInputs = [
+    pkgs.python3Packages.pytest
+    pkgs.python3Packages.pytest-xdist
+  ];
   checkPhase = ''
     PYTHONPATH= $out/bin/nix-update --help
   '';

pyproject.toml

@@ -21,6 +21,9 @@ Homepage = "https://github.com/Mic92/nix-update"
 [project.scripts]
 nix-update = "nix_update:main"
 
+[tool.pytest.ini_options]
+addopts = "-v -n auto"
+
 [tool.ruff]
 target-version = "py311"
 line-length = 88

tests/test_cargo_lock_update.py

@@ -14,7 +14,7 @@ def test_main(helpers: conftest.Helpers) -> None:
                 "--commit",
                 "cargoLock.update",
                 "--version",
-                "v0.4.7",
+                "0.7.3",
             ]
         )
         subprocess.run(
@@ -39,4 +39,4 @@ def test_main(helpers: conftest.Helpers) -> None:
             check=True,
         ).stdout.strip()
         print(diff)
-        assert "https://github.com/astral-sh/ruff/compare/v0.4.5...v0.4.7" in diff
+        assert "https://github.com/astral-sh/ruff/compare/0.7.0...0.7.3" in diff

tests/test_flake.py

@@ -31,3 +31,12 @@ def test_main(helpers: conftest.Helpers) -> None:
         print(commit)
         assert f"crate: 8.0.0 -> {version}" in commit
         assert "https://diff.rs/fd-find/8.0.0/" in commit
+
+        diff = subprocess.run(
+            ["git", "-C", path, "show"],
+            text=True,
+            stdout=subprocess.PIPE,
+            check=True,
+        ).stdout.strip()
+        print(diff)
+        assert "https://diff.rs/fd-find/8.0.0/10.2.0" in diff

tests/testpkgs/cargo-lock-update/default.nix

@@ -1,20 +1,23 @@
-{ rustPlatform, fetchFromGitHub }:
-
+{
+  rustPlatform,
+  fetchFromGitHub,
+}:
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.4.5";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = pname;
-    rev = "v${version}";
+    rev = version;
     hash = "sha256-+8JKzKKWPQEanU2mh8p5sRjnoU6DawTQQi43qRXVXIg=";
   };
 
   cargoLock = {
     lockFile = src + "/Cargo.lock";
     outputHashes = {
       "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
+      "salsa-0.18.0" = "sha256-vuLgeaqIL8U+5PUHJaGdovHFapAMGGQ9nPAMJJnxz/o=";
     };
   };
 }

tests/testpkgs/crate.nix

@@ -3,7 +3,6 @@
   fetchCrate,
   hello,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "fd-find";
   version = "8.0.0";
@@ -13,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };
 
-  cargoSha256 = "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=";
+  cargoHash = "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=";
 
   passthru.tests = {
     foo = hello;

tests/testpkgs/flake.nix

@@ -1,6 +1,9 @@
 {
   outputs =
-    { self, nixpkgs }:
+    {
+      self,
+      nixpkgs,
+    }:
     {
       packages = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: {
         crate = nixpkgs.legacyPackages.${system}.callPackage (self + "/crate.nix") { };