From 8437218782d6baafe5c60c81f099bcf073458b11 Mon Sep 17 00:00:00 2001
From: trevorb1 <trevor_barnes@sfu.ca>
Date: Tue, 21 May 2024 10:32:40 -0700
Subject: [PATCH] update env

---
 workflow/envs/dashboard.yaml        | 19 ------------------
 workflow/envs/osemosys-global.yaml  | 30 +++++++++++++++--------------
 workflow/envs/osemosys-minimal.yaml | 20 -------------------
 3 files changed, 16 insertions(+), 53 deletions(-)
 delete mode 100644 workflow/envs/dashboard.yaml
 delete mode 100644 workflow/envs/osemosys-minimal.yaml

diff --git a/workflow/envs/dashboard.yaml b/workflow/envs/dashboard.yaml
deleted file mode 100644
index 85ae2c79..00000000
--- a/workflow/envs/dashboard.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: osemosys-global-dashboard
-
-channels:
- - bioconda
- - conda-forge
- 
-dependencies:
- - python>=3.9
- - pip
-
- - pandas>=2.0
- - geopandas
- - plotly
- - pytest
-
- - pip:
-   - otoole>1.1.0
-   - dash
-   # - osemosys_global
diff --git a/workflow/envs/osemosys-global.yaml b/workflow/envs/osemosys-global.yaml
index 5ebefb81..406091a3 100644
--- a/workflow/envs/osemosys-global.yaml
+++ b/workflow/envs/osemosys-global.yaml
@@ -1,25 +1,27 @@
 name: osemosys-global
 
 channels:
+ - defaults
  - bioconda
  - conda-forge
  
 dependencies:
  - python>=3.9
- - pip
+ - pip>=24.0
 
- - pandas>=2.0
- - urllib3
- - matplotlib
- - seaborn
- - snakemake-minimal
- - pytest
- - scikit-learn
- - cartopy
+ - pandas==2.0.3 # otoole req. Relax to 2.2 in upcoming release
+ - urllib3>=2.2
+ - matplotlib>=3.8
+ - seaborn>=0.13
+ - snakemake-minimal>=7.32
+ - pytest>=8.2
+ - scikit-learn>=1.4
+ - cartopy>=0.23
+ - geopandas>=0.14
+ - plotly>=5.22
 
  - pip:
-   - world-bank-data
-   - otoole>=1.1.0
-   - dash
-   - geos
-   - git+https://github.com/OSeMOSYS/osemosys_global@master
+   - world-bank-data>=0.1.3
+   - otoole==1.1.2
+   - dash==2.17
+   - .
diff --git a/workflow/envs/osemosys-minimal.yaml b/workflow/envs/osemosys-minimal.yaml
deleted file mode 100644
index b9e555e2..00000000
--- a/workflow/envs/osemosys-minimal.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: osemosys_minimal
-
-channels:
-  - bioconda
-  - conda-forge
-
-dependencies:
-  - python>=3.9
-  - pandas>=2.0
-  - seaborn
-  - snakemake
-  - openpyxl
-  - pip
-  - scikit-learn
-  - plotly
-  - snakemake-minimal
-
-  - pip:
-      - world-bank-data
-      - otoole>=1.1.0
\ No newline at end of file