Merge branch 'master' of https://github.com/tkchafin/resistnet

tkchafin · May 8, 2024 · 0ed6af8 · 0ed6af8
2 parents 72c373f + f6ef617
commit 0ed6af8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/conda-docker-update.yml b/.github/workflows/conda-docker-update.yml
@@ -35,7 +35,9 @@ jobs:
       - name: Install Dependencies
         shell: bash -l {0} 
         run: |
-          conda install -y anaconda::conda-build>=24.1.0 anaconda-client conda-verify
+          conda update -n base -c defaults conda
+          conda install -y anaconda::conda-build>=24.3.0 anaconda-client conda-verify
+          conda update --all
 
       - name: Build Conda Package
         shell: bash -l {0} 
@@ -68,5 +70,5 @@ jobs:
         context: .
         file: ./docker/Dockerfile
         push: true
-        tags: tkchafin/autostreamtree:latest,tkchafin/autostreamtree:${{ github.event.release.tag_name }}
+        tags: tkchafin/resistnet:latest,tkchafin/resistnet:${{ github.event.release.tag_name }}
 
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -6,7 +6,7 @@ channels:
 
 package:
   name: resistnet
-  version: "1.1.2"
+  version: "$VERSION"
 
 source:
   path: ../ 
@@ -47,4 +47,4 @@ build:
 about:
   home: "https://github.com/tkchafin/resistnet"
   license: "GPLv3"
-  summary: "Package for optimising environmental resistance networks from genetic distances"
+  summary: "Package for optimising environmental resistance networks from genetic distances"