Add 'all' optional dependencies to pyproject.toml

and other minor fixes
chrisyeh96 · Nov 17, 2023 · 989edf3 · 989edf3
1 parent a0053cb
commit 989edf3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,32 +24,49 @@ 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]
 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"]
diff --git a/sustaingym/envs/cogen/env.py b/sustaingym/envs/cogen/env.py
@@ -114,8 +114,6 @@ def __init__(self,
         inputs_table.drop(columns=['index'], inplace=True)
         inputs_table.set_index('id', inplace=True)
 
-        # output_labels = [json_data['outputs'][i]['id'] for i in range(len(json_data['outputs']))]
-
         # action space is power output, evaporative cooler switch, power augmentation switch, and equivalent
         # process steam flow for generators 1, 2, and 3, as well as steam turbine power output, steam flow
         # through condenser, and number of cooling bays employed