Move tsam installation to conda

pypsa-meets-earth · Jan 3, 2025 · 38ac5ea · 38ac5ea
1 parent d463de7
commit 38ac5ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/envs/environment.yaml b/envs/environment.yaml
@@ -51,6 +51,7 @@ dependencies:
 - pyogrio
 - numba
 - py7zr
+- tsam>=1.1.0
 
   # Keep in conda environment when calling ipython
 - ipython
@@ -86,6 +87,5 @@ dependencies:
 
 - pip:
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
-  - tsam>=1.1.0
   - chaospy  # lastest version only available on pip
   - fake_useragent
diff --git a/envs/linux-pinned.yaml b/envs/linux-pinned.yaml
@@ -516,6 +516,7 @@ dependencies:
 - tornado=6.4.2
 - tqdm=4.67.1
 - traitlets=5.14.3
+- tsam=2.3.6
 - types-python-dateutil=2.9.0.20241206
 - typing-extensions=4.12.2
 - typing_extensions=4.12.2

diff --git a/envs/macos-pinned.yaml b/envs/macos-pinned.yaml
@@ -461,6 +461,7 @@ dependencies:
 - tornado=6.4.2
 - tqdm=4.67.1
 - traitlets=5.14.3
+- tsam=2.3.6
 - types-python-dateutil=2.9.0.20241206
 - typing-extensions=4.12.2
 - typing_extensions=4.12.2

diff --git a/envs/windows-pinned.yaml b/envs/windows-pinned.yaml
@@ -449,6 +449,7 @@ dependencies:
 - tornado=6.4.2
 - tqdm=4.67.1
 - traitlets=5.14.3
+- tsam=2.3.6
 - types-python-dateutil=2.9.0.20241206
 - typing-extensions=4.12.2
 - typing_extensions=4.12.2
@@ -504,5 +505,4 @@ dependencies:
   - googledrivedownloader==0.4
   - highspy==1.9.0
   - polars==1.17.1
-  - tsam==2.3.6
 prefix: C:\Miniconda\envs\pypsa-earth