Merge pull request #1826 from merenlab/new-release

v7.1
merenlab · Oct 20, 2021 · 258991a · 258991a
2 parents a90d6a5 + 91061d5
commit 258991a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@
 #
 
 FROM continuumio/miniconda3:4.9.2
-ENV ANVIO_VERSION "7"
+ENV ANVIO_VERSION "7.1"
 
 RUN conda config --env --add channels bioconda
 RUN conda config --env --add channels conda-forge

diff --git a/anvio/__init__.py b/anvio/__init__.py
@@ -15,7 +15,7 @@
 # unless you want to explode `bottle`:
 import pkg_resources
 
-anvio_version = '7-dev'
+anvio_version = '7.1'
 anvio_codename = 'hope' # after Hope E. Hopps, https://sivb.org/awards/student-awards/hope-e-hopps-award.html
                         # see the release notes for details: https://github.com/merenlab/anvio/releases/tag/v7
 

diff --git a/conda-recipe/anvio-minimal/meta.yaml b/conda-recipe/anvio-minimal/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "7" %}
+{% set version = "7.1" %}
 
 package:
   name: anvio-minimal
@@ -24,13 +24,10 @@ requirements:
     - pysam
     - ete3
     - scipy
-    # the following prevents an openmp error first reported in
-    # merenlab/anvio#1489 that also occurs during conda bulid:
-    # https://github.com/bioconda/bioconda-recipes/pull/26014#issuecomment-753693842
-    - scikit-learn >=0.23.2
+    - scikit-learn
     - django
     - requests
-    - psutil ==5.4.3
+    - psutil
     - mistune
     - six
     - pandas ==0.25.1

diff --git a/conda-recipe/anvio/meta.yaml b/conda-recipe/anvio/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "7" %}
+{% set version = "7.1" %}
 
 package:
   name: anvio

diff --git a/requirements.txt b/requirements.txt
@@ -15,7 +15,7 @@ illumina-utils
 tabulate
 numba
 paste
-pyani==0.2.10
-psutil==5.4.3
+pyani
+psutil
 pandas==0.25.1
-snakemake==5.10.0
+snakemake==5.10.0