Merge branch 'development' into fix_issue_#408

NREL · Dec 12, 2024 · a0d9ebc · a0d9ebc
2 parents 65c973c + 596f584
commit a0d9ebc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rdtools/plotting.py b/rdtools/plotting.py
@@ -95,9 +95,9 @@ def degradation_summary_plots(yoy_rd, yoy_ci, yoy_info, normalized_yield,
     ax2.set_xlim(hist_xmin, hist_xmax)
 
     label = (
-        ' $R_{d}$ = %.2f%%/yr \n'
-        'confidence interval: \n'
-        '%.2f to %.2f %%/yr' % (yoy_rd, yoy_ci[0], yoy_ci[1])
+        f" $R_{{d}}$ = {yoy_rd:.2f}%/yr \n"
+        f"confidence interval: \n"
+        f"{yoy_ci[0]:.2f} to {yoy_ci[1]:.2f} %/yr"
     )
     if detailed:
         n = yoy_values.notnull().sum()

diff --git a/setup.py b/setup.py
@@ -52,9 +52,9 @@
     "plotly>=4.0.0",
     "xgboost >= 1.6.0",
     "pvlib >= 0.11.0, <0.12.0",
-    "scikit-learn >= 1.1.3",
+    "scikit-learn >= 1.1.3, <1.6.0",
     "arch >= 5.0",
-    "filterpy >= 1.4.2"
+    "filterpy >= 1.4.2",
 ]
 
 EXTRAS_REQUIRE = {