From 16b462137d07a3e341c2e1197e907ae902f0d48d Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 09:47:55 -0400 Subject: [PATCH 1/6] use build.os in readthedocs config https://blog.readthedocs.com/use-build-os-config/ --- .readthedocs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 94b75661..a75f7f27 100644 --- 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: . From 652d3be3fe54f1b8eeac98e7f1ae9dadda12146d Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Tue, 31 Oct 2023 14:24:17 -0600 Subject: [PATCH 2/6] check whether pandas 2.1 is causing test problems --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a3618d11..0c617fa6 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ INSTALL_REQUIRES = [ 'matplotlib >= 3.0.0', 'numpy >= 1.17.3', - 'pandas >= 1.3.0', + 'pandas >= 1.3.0, <2.1', 'statsmodels >= 0.11.0', 'scipy >= 1.2.0', 'h5py >= 2.8.0', From f5f512eb912cb05e4eaf7daa331df15c41e2adf3 Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Wed, 1 Nov 2023 11:42:11 -0600 Subject: [PATCH 3/6] update interpolate_test.py to check for specific warning message --- rdtools/test/interpolate_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdtools/test/interpolate_test.py b/rdtools/test/interpolate_test.py index 1cac37b9..448d3ed3 100644 --- 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") From 1e665be8442eac42e94d392dcf12049650b84f85 Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Wed, 1 Nov 2023 17:19:25 -0600 Subject: [PATCH 4/6] breadcrumbs --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 0c617fa6..4a751966 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,9 @@ INSTALL_REQUIRES = [ 'matplotlib >= 3.0.0', 'numpy >= 1.17.3', + # 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', From 410a94325031324a35276e671bead926c81401e5 Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Wed, 1 Nov 2023 23:04:14 -0600 Subject: [PATCH 5/6] update changelog --- docs/sphinx/source/changelog.rst | 1 + docs/sphinx/source/changelog/pending.rst | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 docs/sphinx/source/changelog/pending.rst diff --git a/docs/sphinx/source/changelog.rst b/docs/sphinx/source/changelog.rst index fede46df..3c8a7b92 100644 --- 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 new file mode 100644 index 00000000..c77995b8 --- /dev/null +++ b/docs/sphinx/source/changelog/pending.rst @@ -0,0 +1,16 @@ +******* +Pending +******* + +Requirements +------------ +* Limit pandas version to <2.1 (:pull:`395`) + +Documentation +------------- +* Update ReadTehDocs configuration (:pull:`395`) + +Contributors +------------ +* Michael Deceglie (:ghuser:`mdeceglie`) +* Kevin Anderson (:ghuser:`kandersolar`) From a0e6919bea7296107c22e6c9a8f4bdbdfed8b430 Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Thu, 2 Nov 2023 10:29:13 -0600 Subject: [PATCH 6/6] typo fix --- docs/sphinx/source/changelog/pending.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/changelog/pending.rst b/docs/sphinx/source/changelog/pending.rst index c77995b8..95e1368b 100644 --- a/docs/sphinx/source/changelog/pending.rst +++ b/docs/sphinx/source/changelog/pending.rst @@ -8,7 +8,7 @@ Requirements Documentation ------------- -* Update ReadTehDocs configuration (:pull:`395`) +* Update ReadTheDocs configuration (:pull:`395`) Contributors ------------