Merge pull request #537 from openeemeter/feature/solar_hourly_model

4.1 Hourly Model Former-commit-id: df821df
opendsm · Jan 28, 2025 · 8047b62 · 8047b62
2 parents 51c22b6 + f77a7a4
commit 8047b62
Show file tree

Hide file tree

Showing 60 changed files with 7,594 additions and 1,096 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ Development
 
 * Placeholder
 
+4.1.0
+-----
+
+* Add new hourly model to support solar meters and improve nonsolar results
+
 4.0.8
 -----
 

diff --git a/Pipfile b/Pipfile
@@ -4,16 +4,16 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
+attrs = "*"
 click = "*"
 matplotlib = "*"
-statsmodels = "*"
-scipy = "*"
-pandas = ">=1.0.0"
-attrs = "*"
-numpy = "*"
 numba = "*"
 nlopt = "*"
+numpy = "*"
+pandas = ">=1.0.0"
 pydantic = ">=2.0"
+scipy = "*"
+statsmodels = "*"
 
 [dev-packages]
 sqlalchemy = "*"

diff --git a/docs/site/objects.inv b/docs/site/objects.inv
diff --git a/docs/site/reference/eemeter/billing_model/index.html b/docs/site/reference/eemeter/billing_model/index.html
diff --git a/docs/site/reference/eemeter/daily_model/index.html b/docs/site/reference/eemeter/daily_model/index.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,11 @@ Development @@
     * Placeholder
+.1.0
+    -----
+    * Add new hourly model to support solar meters and improve nonsolar results
 .0.8
     -----
@@ Expand Down @@