Merge remote-tracking branch 'origin/master' into bio-to-meoh

PyPSA · Aug 8, 2023 · e4744d3 · e4744d3
2 parents 5ce58f4 + 2148935
commit e4744d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,12 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2.1.1 
+    - uses: mamba-org/setup-micromamba@v1
       with:
-          python-version: 3.8
-          environment-file: environment.yaml
-          activate-environment: technology-data
-          auto-activate-base: false
+        micromamba-version: latest
+        environment-file: environment.yaml
+        log-level: debug
+        init-shell: bash
+        cache-environment: true
+        cache-downloads: true
     - name: Test snakemake workflow
       shell: bash -l {0}
       run: |

diff --git a/environment.yaml b/environment.yaml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - bioconda
 dependencies:
-  - python
+  - python>=3.9
   - pip
   - snakemake-minimal
   - pandas>=1.1.0,<1.3