From 4ab5c0c4ed7c2a5ec70df36df98a4cdb050a49f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:42:40 +0000 Subject: [PATCH 01/17] Bump pygments from 2.7.4 to 2.15.0 in /docs Bumps [pygments](https://github.com/pygments/pygments) from 2.7.4 to 2.15.0. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](https://github.com/pygments/pygments/compare/2.7.4...2.15.0) --- updated-dependencies: - dependency-name: pygments dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/notebook_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/notebook_requirements.txt b/docs/notebook_requirements.txt index a2df5e3af..7780560c9 100644 --- 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 From f812c17a7d80c0fa6fdf905f5625caec4020f0b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:42:47 +0000 Subject: [PATCH 02/17] Bump certifi from 2022.12.7 to 2023.7.22 Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22. - [Commits](https://github.com/certifi/python-certifi/compare/2022.12.07...2023.07.22) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 822b152e9..54d548325 100644 --- 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 From 1a931a70e20cad5ab30f61de1af7853d739e3996 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:42:50 +0000 Subject: [PATCH 03/17] Bump requests from 2.25.1 to 2.31.0 Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 822b152e9..58a8fcaa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ pvlib==0.9.0 pyparsing==2.4.7 python-dateutil==2.8.1 pytz==2019.3 -requests==2.25.1 +requests==2.31.0 retrying==1.3.3 scikit-learn==1.0.2 scipy==1.7.2 From a8057de34d8b9f0b61ce5130d2bccbb98ac2cd6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 14:42:58 +0000 Subject: [PATCH 04/17] Bump scipy from 1.2.0 to 1.10.0 Bumps [scipy](https://github.com/scipy/scipy) from 1.2.0 to 1.10.0. - [Release notes](https://github.com/scipy/scipy/releases) - [Commits](https://github.com/scipy/scipy/compare/v1.2.0...v1.10.0) --- updated-dependencies: - dependency-name: scipy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements-min.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-min.txt b/requirements-min.txt index 86fd14bcf..eddde436d 100644 --- a/requirements-min.txt +++ b/requirements-min.txt @@ -3,7 +3,7 @@ matplotlib==3.0.0 numpy==1.17.3 pandas==1.3.0 pvlib==0.7.0 -scipy==1.2.0 +scipy==1.10.0 statsmodels==0.11.0 tables==3.5.1 numexpr==2.7.1 # https://github.com/pydata/numexpr/issues/369 diff --git a/requirements.txt b/requirements.txt index 822b152e9..0e35b09e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ pytz==2019.3 requests==2.25.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 From e5567d5dc0aee6abc6b686cb2e78397fa0cc116c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 22:25:47 +0000 Subject: [PATCH 05/17] Bump tornado from 6.1 to 6.3.3 in /docs Bumps [tornado](https://github.com/tornadoweb/tornado) from 6.1 to 6.3.3. - [Changelog](https://github.com/tornadoweb/tornado/blob/master/docs/releases.rst) - [Commits](https://github.com/tornadoweb/tornado/compare/v6.1.0...v6.3.3) --- updated-dependencies: - dependency-name: tornado dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/notebook_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/notebook_requirements.txt b/docs/notebook_requirements.txt index a2df5e3af..934393628 100644 --- a/docs/notebook_requirements.txt +++ b/docs/notebook_requirements.txt @@ -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 From 9aef74a9e92adf23b75e0eb8e3dd673ae02420d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 00:54:15 +0000 Subject: [PATCH 06/17] Bump pillow from 9.3.0 to 10.0.1 Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/9.3.0...10.0.1) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 822b152e9..9a0086903 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ 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 From 16b462137d07a3e341c2e1197e907ae902f0d48d Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 10 Oct 2023 09:47:55 -0400 Subject: [PATCH 07/17] 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 94b756610..a75f7f277 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 ca73e10381925c9b3734b4b653293a4a72bc7940 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 01:55:17 +0000 Subject: [PATCH 08/17] Bump urllib3 from 1.26.5 to 1.26.18 Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.5 to 1.26.18. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.5...1.26.18) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 822b152e9..0899734b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,5 +28,5 @@ 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 From 652d3be3fe54f1b8eeac98e7f1ae9dadda12146d Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Tue, 31 Oct 2023 14:24:17 -0600 Subject: [PATCH 09/17] 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 a3618d11c..0c617fa60 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 10/17] 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 1cac37b9e..448d3ed39 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 11/17] breadcrumbs --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 0c617fa60..4a7519665 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 12/17] 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 fede46df9..3c8a7b921 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 000000000..c77995b84 --- /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 13/17] 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 c77995b84..95e1368b5 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 ------------ From a27692742c938f0051747b2d39930295e0ec62f0 Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Thu, 2 Nov 2023 11:16:13 -0600 Subject: [PATCH 14/17] reverse requirements-min requirements-min is for testing and is not a recommendation and so old packages are allowed --- requirements-min.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-min.txt b/requirements-min.txt index eddde436d..86fd14bcf 100644 --- a/requirements-min.txt +++ b/requirements-min.txt @@ -3,7 +3,7 @@ matplotlib==3.0.0 numpy==1.17.3 pandas==1.3.0 pvlib==0.7.0 -scipy==1.10.0 +scipy==1.2.0 statsmodels==0.11.0 tables==3.5.1 numexpr==2.7.1 # https://github.com/pydata/numexpr/issues/369 From 9629e119c28b3e67d37fe5fc34ffb19b5e02dfcb Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Thu, 2 Nov 2023 14:47:22 -0600 Subject: [PATCH 15/17] Update changelog for release --- docs/sphinx/source/changelog.rst | 2 +- docs/sphinx/source/changelog/{pending.rst => v2.1.7.rst} | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename docs/sphinx/source/changelog/{pending.rst => v2.1.7.rst} (58%) diff --git a/docs/sphinx/source/changelog.rst b/docs/sphinx/source/changelog.rst index 3c8a7b921..d29155dc3 100644 --- a/docs/sphinx/source/changelog.rst +++ b/docs/sphinx/source/changelog.rst @@ -1,6 +1,6 @@ RdTools Change Log ================== -.. include:: changelog/pending.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/pending.rst b/docs/sphinx/source/changelog/v2.1.7.rst similarity index 58% rename from docs/sphinx/source/changelog/pending.rst rename to docs/sphinx/source/changelog/v2.1.7.rst index 95e1368b5..2b053e6fc 100644 --- a/docs/sphinx/source/changelog/pending.rst +++ b/docs/sphinx/source/changelog/v2.1.7.rst @@ -1,10 +1,11 @@ -******* -Pending -******* +************************* +v2.1.7 (November 2, 2023) +************************* Requirements ------------ * Limit pandas version to <2.1 (:pull:`395`) +* Several packages updated in``requirements.txt`` and ``docs/notebook_requirements.txt`` (:pull:`398`) Documentation ------------- From 60779a571e41368f606fa672fa13ae1406810846 Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Fri, 3 Nov 2023 12:14:31 -0600 Subject: [PATCH 16/17] release date correction --- docs/sphinx/source/changelog/v2.1.7.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/changelog/v2.1.7.rst b/docs/sphinx/source/changelog/v2.1.7.rst index 2b053e6fc..a0b2eda24 100644 --- a/docs/sphinx/source/changelog/v2.1.7.rst +++ b/docs/sphinx/source/changelog/v2.1.7.rst @@ -1,5 +1,5 @@ ************************* -v2.1.7 (November 2, 2023) +v2.1.7 (November 3, 2023) ************************* Requirements From 1c20b8326e27f24f2b37c4eae30863d7efdd9a3d Mon Sep 17 00:00:00 2001 From: Michael Deceglie Date: Fri, 3 Nov 2023 14:48:09 -0600 Subject: [PATCH 17/17] fix requests version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2c0be5afd..e18102ef2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ python-dateutil==2.8.1 pytz==2019.3 arch==4.11 filterpy==1.4.5 -requests==2.31.1 +requests==2.31.0 retrying==1.3.3 scikit-learn==1.0.2 scipy==1.10.0