Skip to content

Commit 121304e

Browse files
authored
Merge pull request #395 from NREL/rtd
Update ReadTheDocs configuration
2 parents 8013982 + a0e6919 commit 121304e

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

.readthedocs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
version: 2
22

3+
build:
4+
os: "ubuntu-22.04"
5+
tools:
6+
python: "3.7"
7+
38
python:
4-
version: "3.7"
59
install:
610
- method: pip
711
path: .

docs/sphinx/source/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
RdTools Change Log
22
==================
3+
.. include:: changelog/pending.rst
34
.. include:: changelog/v2.1.6.rst
45
.. include:: changelog/v2.1.5.rst
56
.. include:: changelog/v2.1.4.rst
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
*******
2+
Pending
3+
*******
4+
5+
Requirements
6+
------------
7+
* Limit pandas version to <2.1 (:pull:`395`)
8+
9+
Documentation
10+
-------------
11+
* Update ReadTheDocs configuration (:pull:`395`)
12+
13+
Contributors
14+
------------
15+
* Michael Deceglie (:ghuser:`mdeceglie`)
16+
* Kevin Anderson (:ghuser:`kandersolar`)

rdtools/test/interpolate_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ def test_interpolate_warning(test_df, df_target_index, df_expected_result):
135135
with pytest.warns(None) as record:
136136
interpolate(test_df, df_target_index, pd.to_timedelta('15 minutes'),
137137
warning_threshold=0.5)
138-
if record:
138+
if 'Fraction of excluded data' in ';'.join([str(x.message) for x in record.list]):
139139
pytest.fail("normalize.interpolate raised a warning about "
140140
"excluded data even though the threshold was high")

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
INSTALL_REQUIRES = [
4343
'matplotlib >= 3.0.0',
4444
'numpy >= 1.17.3',
45-
'pandas >= 1.3.0',
45+
# pandas restricted to <2.1 until
46+
# https://github.com/pandas-dev/pandas/issues/55794
47+
# is resolved
48+
'pandas >= 1.3.0, <2.1',
4649
'statsmodels >= 0.11.0',
4750
'scipy >= 1.2.0',
4851
'h5py >= 2.8.0',

0 commit comments

Comments
 (0)