From d50bdc43761c68f4c4c8ed9cdef9254feb1ade38 Mon Sep 17 00:00:00 2001 From: Christopher Yeh Date: Fri, 17 Nov 2023 03:58:20 +0000 Subject: [PATCH] Update pyproject.toml dependencies and env_*.yml files Use dev version of acnportal --- env_cogen.yml | 8 ++------ env_ev.yml | 3 +-- pyproject.toml | 33 +++++++++++++++++++++++++-------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/env_cogen.yml b/env_cogen.yml index 89bd48a..4488c1c 100755 --- a/env_cogen.yml +++ b/env_cogen.yml @@ -13,11 +13,8 @@ # - only supports gymnasium 0.28.1 (see https://github.com/ray-project/ray/blob/ray-2.8.0/python/setup.py#L305) # - officially seems to only supports pettingzoo 1.23.1 (see https://github.com/ray-project/ray/blob/ray-2.8.0/python/requirements/ml/rllib-test-requirements.txt), # but empirically seems to work with pettingzoo 1.24.* -# - Onnxruntime 1.16: -# - pre-built pip package only supports up to CUDA 11.8 (see https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html) -# - PyTorch 2.1 supports both CUDA 11.8 and 12.1 # -# last updated: November 13, 2023 +# last updated: November 16, 2023 name: sustaingym_cogen channels: - pytorch # for pytorch @@ -47,11 +44,10 @@ dependencies: - gymnasium==0.28.1 - pettingzoo==1.24.1 - ray[rllib]==2.8.* + - onnxruntime==1.16.* # the ONNX model for CogenEnv is small and runs sufficiently fast on CPU # uncomment for CPU-only - # - onnxruntime==1.16.* # - tensorflow==2.14.* # for GPU. comment out for CPU-only. - - onnxruntime-gpu==1.16.* - tensorflow[and-cuda]==2.14.* diff --git a/env_ev.yml b/env_ev.yml index b42a5dd..d49223f 100755 --- a/env_ev.yml +++ b/env_ev.yml @@ -9,7 +9,6 @@ # - latest official release v0.3.2 only supports up to Pandas 1.1, # and Pandas 1.1 only supports up to Python 3.9 # - we install from the ACNPortal dev branch, which includes a fix that supports Pandas 2 -# # - TensorFlow 2.14: # - the GPU version only works with Python <=3.10 (see https://github.com/tensorflow/tensorflow/issues/61986) # - TensorFlow 2.15 should fix this issue @@ -19,7 +18,7 @@ # - officially seems to only supports pettingzoo 1.23.1 (see https://github.com/ray-project/ray/blob/ray-2.8.0/python/requirements/ml/rllib-test-requirements.txt), # but empirically seems to work with pettingzoo 1.24.* # -# last updated: November 13, 2023 +# last updated: November 16, 2023 name: sustaingym_ev channels: - pytorch # for pytorch diff --git a/pyproject.toml b/pyproject.toml index ec64b91..68fbbd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,26 +24,40 @@ dependencies = [ [project.optional-dependencies] # Update dependencies in `all` if any are added or removed -evcharging = [ - "acnportal==0.3.2", +all = [ + "acnportal@git+https://github.com/zach401/acnportal@0127a055cf", "cvxpy>=1.3, <2", # semver "mosek>=10.0.44, <11", # semver - "pandas==1.1.*", # semver + "openpyxl>=3.1", + "onnxruntime>=1.15, <2", # semver + "pandas>=1.1, <3", # semver + "pvlib>=0.10", "pytz", "requests>=2.31.0", # semver "scikit-learn>=1.1.1", # semver + "scipy>=1.0", + "xlrd>=2", +] +building = [ + "cvxpy>=1.3, <2", # semver + "pvlib>=0.10", + "scikit-learn>=1.1.1", # semver + "scipy>=1.0", ] cogen = [ - "openpyxl>=3.1", "onnxruntime>=1.15, <2", # semver + "openpyxl>=3.1", "pandas>=1.1, <3", # semver - "xlrd>=2" + "xlrd>=2", ] -building = [ +evcharging = [ + "acnportal@git+https://github.com/zach401/acnportal@0127a055cf", "cvxpy>=1.3, <2", # semver - "pvlib>=0.10", + "mosek>=10.0.44, <11", # semver + "pandas>=1.1, <3", # semver + "pytz", + "requests>=2.31.0", # semver "scikit-learn>=1.1.1", # semver - "scipy>=1.0" ] [project.urls] @@ -51,5 +65,8 @@ Homepage = "https://chrisyeh96.github.io/sustaingym/" Repository = "https://github.com/chrisyeh96/sustaingym" "Bug Tracker" = "https://github.com/chrisyeh96/sustaingym/issues" +[tool.setuptools] +packages = ["sustaingym"] + [tool.setuptools.package-data] "*" = ["*.csv", "*.csv.gz", "*.epw", "*.htm", "*.json", "*.onnx", "*.pkl", "*.xlsx"] \ No newline at end of file