From 447ca16a583aebf7888e87ceaf3c27a66d6b0728 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Thu, 2 May 2024 21:32:03 -0700 Subject: [PATCH 1/4] reqs update --- docs/requirements.txt | 2 +- setup.cfg | 14 +++++++------- workflow/envs/dashboard.yaml | 4 ++-- workflow/envs/osemosys-global.yaml | 4 ++-- workflow/envs/osemosys-minimal.yaml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d0ba7ec8..8ce4b824 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -15,10 +15,10 @@ scipy dash geos cartopy +pandas>=2.0 # docs sphinx myst-parser pydata-sphinx-theme>=0.8.1 -sphinx-book-theme docutils==0.17.1 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index f7d2b4b1..01844ced 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,9 +49,8 @@ python_requires = >=3.9 # For more information, check out https://semver.org/. install_requires = importlib-metadata; python_version<"3.8" - #sphinx>=3.2.1 - Sphinx==4.2.0 - furo + # package + pandas>=2.0 matplotlib seaborn geopandas @@ -63,12 +62,13 @@ install_requires = world-bank-data scikit-learn otoole>=1.1.0 - sphinx-book-theme - myst-parser - otoole>=1.1.0 scipy dash - pydata-sphinx-theme>=0.8.1 + # docs + furo + Sphinx==4.2.0 + sphinx-book-theme>=0.8.1 + myst-parser docutils>=0.17.1 [options.packages.find] diff --git a/workflow/envs/dashboard.yaml b/workflow/envs/dashboard.yaml index 68145fe8..85ae2c79 100644 --- a/workflow/envs/dashboard.yaml +++ b/workflow/envs/dashboard.yaml @@ -5,10 +5,10 @@ channels: - conda-forge dependencies: - - python>=3.8 + - python>=3.9 - pip - - pandas + - pandas>=2.0 - geopandas - plotly - pytest diff --git a/workflow/envs/osemosys-global.yaml b/workflow/envs/osemosys-global.yaml index 1628cdb3..5ebefb81 100644 --- a/workflow/envs/osemosys-global.yaml +++ b/workflow/envs/osemosys-global.yaml @@ -5,10 +5,10 @@ channels: - conda-forge dependencies: - - python>=3.8 + - python>=3.9 - pip - - pandas + - pandas>=2.0 - urllib3 - matplotlib - seaborn diff --git a/workflow/envs/osemosys-minimal.yaml b/workflow/envs/osemosys-minimal.yaml index 976e979f..b9e555e2 100644 --- a/workflow/envs/osemosys-minimal.yaml +++ b/workflow/envs/osemosys-minimal.yaml @@ -5,8 +5,8 @@ channels: - conda-forge dependencies: - - python>=3.8 - - pandas + - python>=3.9 + - pandas>=2.0 - seaborn - snakemake - openpyxl From 8437218782d6baafe5c60c81f099bcf073458b11 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Tue, 21 May 2024 10:32:40 -0700 Subject: [PATCH 2/4] 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 From fd2deeb7ca7a7a82bc25bf3659ff1434fa02744d Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Tue, 21 May 2024 10:40:54 -0700 Subject: [PATCH 3/4] fix local install path --- workflow/envs/osemosys-global.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/envs/osemosys-global.yaml b/workflow/envs/osemosys-global.yaml index 406091a3..4f66048a 100644 --- a/workflow/envs/osemosys-global.yaml +++ b/workflow/envs/osemosys-global.yaml @@ -24,4 +24,4 @@ dependencies: - world-bank-data>=0.1.3 - otoole==1.1.2 - dash==2.17 - - . + - ../../. # path to setup.py From ae3244f305b9678aa6b7ecedef31883408f29f79 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Thu, 23 May 2024 09:33:05 -0700 Subject: [PATCH 4/4] update setup --- setup.cfg | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/setup.cfg b/setup.cfg index 01844ced..e5a0d24a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,16 +12,10 @@ license = APGL-3.0 license_files = LICENSE.txt long_description = file: README.md long_description_content_type = text/x-rst; charset=UTF-8 -url = https://github.com/pyscaffold/pyscaffold/ +url = https://github.com/OSeMOSYS/osemosys_global # Add here related links, for example: project_urls = - Documentation = https://pyscaffold.org/ -# Source = https://github.com/pyscaffold/pyscaffold/ -# Changelog = https://pyscaffold.org/en/latest/changelog.html -# Tracker = https://github.com/pyscaffold/pyscaffold/issues -# Conda-Forge = https://anaconda.org/conda-forge/pyscaffold -# Download = https://pypi.org/project/PyScaffold/#files -# Twitter = https://twitter.com/PyScaffold + Documentation = https://osemosys-global.readthedocs.io # Change if running only on Windows, Mac or Linux (comma-separated) platforms = any @@ -56,7 +50,6 @@ install_requires = geopandas urllib3 PyYAML - geos cartopy pytest world-bank-data @@ -64,12 +57,6 @@ install_requires = otoole>=1.1.0 scipy dash - # docs - furo - Sphinx==4.2.0 - sphinx-book-theme>=0.8.1 - myst-parser - docutils>=0.17.1 [options.packages.find] where = workflow/scripts