Merge branch 'latest' into add-tax-ani

sourmash-bio · Jul 24, 2022 · 984c5e6 · 984c5e6
2 parents 6ee6446 + 1bc273d
commit 984c5e6
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 31 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,6 +12,7 @@ updates:
   allow:
     - dependency-type: "direct"
   open-pull-requests-limit: 10
+  rebase-strategy: "disabled"  
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -12,6 +12,10 @@ conda:
   environment: doc/environment.yml
 
 python:
+  # NOTE: doc/environment.yml specifies python=3.10, which is needed
+  # b/c of a pip problem; see
+  # https://github.com/sourmash-bio/sourmash/issues/2139
+  # this 'version' setting is effectively ignored, AFAICT. -- CTB 7/24/22
   version: 3.8
   install:
     - method: pip

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/doc/environment.yml b/doc/environment.yml
@@ -3,4 +3,5 @@ channels:
   - defaults
 dependencies:
   - rust
-  - python =3.8
+  - python=3.10
+  - pip
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -68,7 +68,7 @@
           sourmash = mach-nix-wrapper.buildPythonPackage {
             src = ./.;
             pname = "sourmash";
-            version = "4.4.0";
+            version = "4.4.2";
             requirements = ''
               screed>=1.0.5
               cffi>=1.14.0
@@ -80,11 +80,12 @@
               bitstring<4,>=3.1.9
             '';
             requirementsExtra = ''
-              setuptools
+              setuptools >= 61
               milksnake
               setuptools_scm[toml] >= 4, <6
+              wheel >= 0.29.0
             '';
-            SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.0";
+            SETUPTOOLS_SCM_PRETEND_VERSION = "4.4.2";
             DYLD_LIBRARY_PATH = "${self.packages.${system}.lib}/lib";
             NO_BUILD = "1";
           };