Merge pull request #395 from NREL/rtd

Update ReadTheDocs configuration
NREL · Nov 2, 2023 · 121304e · 121304e
2 parents 8013982 + a0e6919
commit 121304e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 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/sphinx/source/changelog.rst b/docs/sphinx/source/changelog.rst
@@ -1,5 +1,6 @@
 RdTools Change Log
 ==================
+.. include:: changelog/pending.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/pending.rst b/docs/sphinx/source/changelog/pending.rst
@@ -0,0 +1,16 @@
+*******
+Pending
+*******
+
+Requirements
+------------
+* Limit pandas version to <2.1 (:pull:`395`)
+
+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/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.0',
     'scipy >= 1.2.0',
     'h5py >= 2.8.0',