Merge branch 'development' into aggregated_filters_for_trials

NREL · Nov 3, 2023 · f22e402 · f22e402
2 parents aa1c007 + 7b2b9b2
commit f22e402
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,7 +1,11 @@
 version: 2
 
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.7"
+
 python:
-    version: "3.7"
     install:
         - method: pip
           path: .

diff --git a/docs/notebook_requirements.txt b/docs/notebook_requirements.txt
@@ -39,7 +39,7 @@ prometheus-client==0.3.0
 prompt-toolkit==3.0.30
 ptyprocess==0.6.0
 pycparser==2.20
-Pygments==2.7.4
+Pygments==2.15.0
 pyzmq==22.2.1
 qtconsole==4.3.1
 Send2Trash==1.8.0
@@ -48,7 +48,7 @@ soupsieve==2.3.2.post1
 terminado==0.8.3
 testpath==0.3.1
 tinycss2==1.1.1
-tornado==6.1
+tornado==6.3.3
 traitlets==5.0.0
 wcwidth==0.1.7
 webencodings==0.5.1

diff --git a/docs/sphinx/source/changelog.rst b/docs/sphinx/source/changelog.rst
@@ -1,6 +1,7 @@
 RdTools Change Log
 ==================
 .. include:: changelog/v2.2.0-beta.1.rst
+.. include:: changelog/v2.1.7.rst
 .. include:: changelog/v2.1.6.rst
 .. include:: changelog/v2.1.5.rst
 .. include:: changelog/v2.1.4.rst

diff --git a/docs/sphinx/source/changelog/v2.1.7.rst b/docs/sphinx/source/changelog/v2.1.7.rst
@@ -0,0 +1,17 @@
+*************************
+v2.1.7 (November 3, 2023)
+*************************
+
+Requirements
+------------
+* Limit pandas version to <2.1 (:pull:`395`)
+* Several packages updated in``requirements.txt`` and ``docs/notebook_requirements.txt`` (:pull:`398`)
+
+Documentation
+-------------
+* Update ReadTheDocs configuration (:pull:`395`)
+
+Contributors
+------------
+* Michael Deceglie (:ghuser:`mdeceglie`)
+* Kevin Anderson (:ghuser:`kandersolar`)
diff --git a/rdtools/test/interpolate_test.py b/rdtools/test/interpolate_test.py
@@ -135,6 +135,6 @@ def test_interpolate_warning(test_df, df_target_index, df_expected_result):
     with pytest.warns(None) as record:
         interpolate(test_df, df_target_index, pd.to_timedelta('15 minutes'),
                     warning_threshold=0.5)
-        if record:
+        if 'Fraction of excluded data' in ';'.join([str(x.message) for x in record.list]):
             pytest.fail("normalize.interpolate raised a warning about "
                         "excluded data even though the threshold was high")
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 cached-property==1.5.2
-certifi==2022.12.7
+certifi==2023.7.22
 chardet==4.0.0
 cycler==0.10.0
 fonttools==4.37.1
@@ -12,23 +12,23 @@ numpy==1.22.0
 packaging==21.3
 pandas==1.3.4
 patsy==0.5.2
-Pillow==9.3.0
+Pillow==10.0.1
 plotly==4.10.0
 pvlib==0.9.0
 pyparsing==2.4.7
 python-dateutil==2.8.1
 pytz==2019.3
 arch==5.5.0
 filterpy==1.4.5
-requests==2.25.1
+requests==2.31.1
 retrying==1.3.3
 scikit-learn==1.0.2
-scipy==1.7.2
+scipy==1.10.0
 setuptools-scm==7.0.5
 six==1.14.0
 statsmodels==0.13.1
 threadpoolctl==3.1.0
 tomli==2.0.1
 typing_extensions==4.3.0
-urllib3==1.26.5
+urllib3==1.26.18
 xgboost==1.5.1
diff --git a/setup.py b/setup.py
@@ -42,7 +42,10 @@
 INSTALL_REQUIRES = [
     'matplotlib >= 3.0.0',
     'numpy >= 1.17.3',
-    'pandas >= 1.3.0',
+    # pandas restricted to <2.1 until
+    # https://github.com/pandas-dev/pandas/issues/55794
+    # is resolved
+    'pandas >= 1.3.0, <2.1',
     'statsmodels >= 0.11.1',
     'scipy >= 1.2.0',
     'h5py >= 2.8.0',