Update taxi flake to use newest python and taxi-zebra version

Author: jocelynthode

.github/workflows/python-package.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["38", "39", "310", "311"]
+        python-version: ["310", "311", "312", "313"]
 
     steps:
       - uses: actions/checkout@v3
@@ -31,8 +31,11 @@ jobs:
         if: "steps.nix-cache.outputs.cache-hit == 'true'"
         run: "nix-store --import < /tmp/nixcache"
 
-      - name: Run tests
-        run: nix build -L .#checks.x86_64-linux.taxiPython${{ matrix.python-version }}
+      - name: Run taxi tests
+        run: nix build -L .#checks.x86_64-linux.taxi-python${{ matrix.python-version }}
+
+      - name: Build taxi with all plugins
+        run: nix build -L .#taxi-with-all-plugins
 
       - name: "Export Nix store cache"
         if: "steps.nix-cache.outputs.cache-hit != 'true'"

doc/userguide.rst

@@ -143,9 +143,9 @@ python3: command not found
 Run the following command::
 
     $ python --version
-    Python 3.8.5
+    Python 3.13.4
 
-Check that the version is at least 3.7. If that’s the case, replace ``python3``
+Check that the version is at least 3.10. If that’s the case, replace ``python3``
 by ``python`` when running commands. If that’s not the case, install Python 3.
 
 First steps with Taxi

flake.lock

@@ -9,38 +9,48 @@
   };
 
   outputs = { self, nixpkgs, flake-utils, ... }:
-    let
-      # Recursively merge a list of attribute sets. Following elements take
-      # precedence over previous elements if they have conflicting keys.
-      recursiveMerge = with nixpkgs.lib; foldl recursiveUpdate { };
-    in recursiveMerge [
-      (flake-utils.lib.eachDefaultSystem (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-          taxi = pkgs.callPackage ./pkgs.nix { };
-        in {
-          packages = { inherit taxi; };
-          defaultPackage = taxi;
-          devShell = pkgs.callPackage ./shell.nix { };
-          checks = let
-            testWithPython = (pythonPackage:
-              pkgs.callPackage ./tests.nix {
-                python3 = pythonPackage;
-                taxi = pkgs.callPackage ./pkgs.nix { python3 = pythonPackage; };
-              });
-          in {
-            # TODO generate this dynamically
-            taxiPython38 = testWithPython pkgs.python38;
-            taxiPython39 = testWithPython pkgs.python39;
-            taxiPython310 = testWithPython pkgs.python310;
-            taxiPython311 = testWithPython pkgs.python311;
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ self.overlays.default ];
+        };
+
+        taxi = pkgs.callPackage ./pkgs.nix { };
+
+        pythonVersions = [ "310" "311" "312" "313" ];
+
+        makeCheckForPython = pythonVersion: let
+          python3 = pkgs."python${pythonVersion}";
+        in
+          pkgs.callPackage ./tests.nix {
+            inherit python3;
+            taxi = pkgs.callPackage ./pkgs.nix { inherit python3; };
           };
-        }))
+
+        checksForPython = builtins.listToAttrs (
+          map (pythonVersion: {
+            name = "taxi-python${pythonVersion}";
+            value = makeCheckForPython pythonVersion;
+          }) pythonVersions
+        );
+      in
       {
-        overlay = final: prev: rec {
-          # Prevents collision with taxi from nixpkgs (sftp app)
-          taxi-cli = self.packages.${prev.stdenv.hostPlatform.system}.taxi;
+        packages = {
+          default = taxi;
+          taxi = taxi;
+          taxi-with-all-plugins = taxi.withPlugins (p: builtins.attrValues p);
         };
+
+        devShells.default = pkgs.callPackage ./shell.nix {};
+
+        checks = checksForPython;
       }
-    ];
+    )
+    // {
+      overlays.default = final: prev: {
+        taxi-cli = final.callPackage ./pkgs.nix { };
+      };
+    };
 }

flake.nix

@@ -45,7 +45,7 @@ let
 
     nativeCheckInputs = [ python3.pkgs.pytestCheckHook python3.pkgs.freezegun ];
 
-    passthru = { inherit withPlugins; };
+    passthru = { inherit withPlugins availablePlugins; };
 
     meta = {
       homepage = "https://github.com/sephii/taxi";
@@ -56,16 +56,18 @@ let
 
   taxiZebra = python3.pkgs.buildPythonPackage rec {
     pname = "taxi_zebra";
-    version = "4.0.0";
+    version = "5.0.0";
 
     src = fetchFromGitHub {
       owner = "liip";
       repo = "taxi-zebra";
       rev = version;
-      sha256 = "sha256-syEGpv8CZOD+TLQskylTnwqCKJRPVVImRfyEwP+9Nuc=";
+      sha256 = "sha256-vwlCdeWvbmoKYdEwKVmBkQTokOY4MGaxnOU3t0CRDS4=";
     };
 
+    format = "pyproject";
     buildInputs = [ taxi ];
+    nativeBuildInputs = [ python3.pkgs.setuptools python3.pkgs.wheel ];
     propagatedBuildInputs = [ python3.pkgs.requests python3.pkgs.click ];
 
     meta = {
@@ -135,4 +137,4 @@ let
     clockify = taxiClockify;
   };
 in
-taxi
+  taxi

pkgs.nix

@@ -5,7 +5,7 @@ authors = [
     {name = "Sylvain Fankhauser", email = "sephi@fhtagn.top"},
 ]
 readme = "README.rst"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dynamic = ["version"]
 dependencies = [
     "click>=3.3",

pyproject.toml

@@ -1,5 +1,12 @@
-{ callPackage, python3, ... }:
-(callPackage ./pkgs.nix { inherit python3; }).overrideAttrs (old: {
-  src = ./.;
-  propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3.pkgs.pytest ];
-})
+{ pkgs ? import <nixpkgs> {} }:
+let
+  taxi = pkgs.callPackage ./pkgs.nix { inherit (pkgs) python3; };
+in
+pkgs.mkShell {
+  name = "taxi-dev-shell";
+
+  buildInputs = [
+    taxi
+    pkgs.python3.pkgs.pytest
+  ];
+}