Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update requirements file #178

Merged
merged 5 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 4 additions & 17 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -49,27 +43,20 @@ 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
urllib3
PyYAML
geos
cartopy
pytest
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
docutils>=0.17.1

[options.packages.find]
where = workflow/scripts
Expand Down
19 changes: 0 additions & 19 deletions workflow/envs/dashboard.yaml

This file was deleted.

32 changes: 17 additions & 15 deletions workflow/envs/osemosys-global.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
name: osemosys-global

channels:
- defaults
- bioconda
- conda-forge

dependencies:
- python>=3.8
- pip
- python>=3.9
- pip>=24.0

- pandas
- 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
- ../../. # path to setup.py
20 changes: 0 additions & 20 deletions workflow/envs/osemosys-minimal.yaml

This file was deleted.

Loading