Merge pull request #176 from OSeMOSYS/pandas-update

Upgrage to `pandas v2.0`
OSeMOSYS · May 1, 2024 · 5572d2e · 5572d2e
2 parents fa0d330 + a644d62
commit 5572d2e
Show file tree

Hide file tree

Showing 10 changed files with 585 additions and 886 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -4,11 +4,11 @@
 # https://setuptools.pypa.io/en/latest/references/keywords.html
 
 [metadata]
-name = feo-esmod-osemosys
-description = Future Energy Outlook
-author = TransitionZero
-author_email = [email protected]
-license = MIT
+name = osemosys_global
+description = Global Energy Model Generator
+author = OSeMOSYS
+author_email = [email protected]
+license = APGL-3.0
 license_files = LICENSE.txt
 long_description = file: README.md
 long_description_content_type = text/x-rst; charset=UTF-8

diff --git a/workflow/envs/osemosys-global.yaml b/workflow/envs/osemosys-global.yaml
@@ -8,7 +8,7 @@ dependencies:
  - python>=3.8
  - pip
 
- - pandas<2.0
+ - pandas
  - urllib3
  - matplotlib
  - seaborn

diff --git a/workflow/envs/osemosys-minimal.yaml b/workflow/envs/osemosys-minimal.yaml
@@ -6,7 +6,7 @@ channels:
 
 dependencies:
   - python>=3.8
-  - pandas=1.4.1
+  - pandas
   - seaborn
   - snakemake
   - openpyxl
@@ -17,4 +17,4 @@ dependencies:
 
   - pip:
       - world-bank-data
-      - otoole==1.1.0
+      - otoole>=1.0.0, <1.1.0
diff --git a/workflow/envs/osemosys_global.yaml b/workflow/envs/osemosys_global.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ dependencies: @@
      - python>=3.8
      - pip
-     - pandas<2.0
+     - pandas
      - urllib3
      - matplotlib
      - seaborn
@@ Expand Down @@