Build: nix updates (sourmash-bio#2088)

* check nix run on CI * run a command that doesn't fail by default
jgardner78 · Jun 19, 2022 · 44f9b05 · 44f9b05
1 parent 09b76ba
commit 44f9b05
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 26 deletions.
diff --git a/.github/workflows/dev_envs.yml b/.github/workflows/dev_envs.yml
@@ -29,6 +29,8 @@ jobs:
 
     - run: ~/bin/nix-portable nix-shell --command "tox -e py39"
 
+    - run: ~/bin/nix-portable nix run . -- --version
+
   mamba:
     runs-on: ubuntu-latest
     steps:

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -21,14 +21,14 @@
     };
 
     mach-nix = {
-      url = "github:DavHau/mach-nix/3.4.0";
+      url = "github:DavHau/mach-nix/3.5.0";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "utils";
       inputs.pypi-deps-db.follows = "pypi-deps-db";
     };
 
     pypi-deps-db = {
-      url = "github:DavHau/mach-nix/3.4.0";
+      url = "github:DavHau/mach-nix/3.5.0";
     };
   };
 
@@ -67,13 +67,24 @@
           };
           sourmash = mach-nix-wrapper.buildPythonPackage {
             src = ./.;
-            version = "4.3.0";
+            pname = "sourmash";
+            version = "4.4.0";
+            requirements = ''
+              screed>=1.0.5
+              cffi>=1.14.0
+              numpy
+              matplotlib
+              scipy
+              deprecation>=2.0.6
+              cachetools<6,>=4
+              bitstring<4,>=3.1.9
+            '';
             requirementsExtra = ''
-              setuptools >= 48, <60
+              setuptools
               milksnake
               setuptools_scm[toml] >= 4, <6
             '';
-            SETUPTOOLS_SCM_PRETEND_VERSION = "4.3.0";
+            SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.0";
             DYLD_LIBRARY_PATH = "${self.packages.${system}.lib}/lib";
             NO_BUILD = "1";
           };

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@ def build_native(spec):
         target = "release"
 
     if NO_BUILD:
-        dylib = lambda: find_dylib("sourmash", os.environ["DYLD_LIBRARY_PATH"])
+        dylib = lambda: find_dylib_no_build("sourmash", os.environ["DYLD_LIBRARY_PATH"])
         header_filename = lambda: "include/sourmash.h"
     else:
         build = spec.add_external_build(cmd=cmd, path=".")
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,8 @@ jobs: @@
         - run: ~/bin/nix-portable nix-shell --command "tox -e py39"
+        - run: ~/bin/nix-portable nix run . -- --version
       mamba:
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@