From d6210f17a13028c2c949293ccb235db218e40a27 Mon Sep 17 00:00:00 2001 From: Nischay Ram Mamidi Date: Mon, 24 Jul 2023 22:11:27 -0400 Subject: [PATCH 1/5] add support for python 3.11 Signed-off-by: Nischay Ram Mamidi --- Makefile | 2 +- requirements/app.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9af156159..ab1b2a901 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ install-flexmeasures: pip install -e . install-pip-tools: - pip3 install -q "pip-tools>=6.4" + pip3 install -q "pip-tools>=7.0" install-docs-dependencies: pip install -r requirements/docs.txt diff --git a/requirements/app.in b/requirements/app.in index 2809f4ec9..398fd7f6c 100644 --- a/requirements/app.in +++ b/requirements/app.in @@ -17,7 +17,7 @@ psycopg2-binary bcrypt pytz # limit the numpy version to make it compatible with numba==0.56.4, which timely-beliefs >=1.18 depends on (library sktime). -numpy<1.24 +numpy<1.26 isodate click click-default-group @@ -67,4 +67,4 @@ Flask-SQLAlchemy>=2.4.3,<3 # flask should be after all the flask plugins, because setup might find they ARE flask # <2.3: https://github.com/Parallels/rq-dashboard/issues/417 and https://github.com/FlexMeasures/flexmeasures/issues/754 and flask-login 0.6.1 not compatible flask>=1.0, <=2.1.2 -werkzeug<=2.1 +werkzeug<=2.1 \ No newline at end of file From 9c920c4f02b92c5c4cc65b11ee0bd9e20ed21220 Mon Sep 17 00:00:00 2001 From: Nischay Ram Mamidi Date: Mon, 31 Jul 2023 08:14:40 -0400 Subject: [PATCH 2/5] add Python 3.11 tag in setup.py Signed-off-by: Nischay Ram Mamidi --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 0b76ea5f9..7aed8cbd6 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ def load_requirements(use_case): "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Framework :: Flask", "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: Apache Software License", From cbb8a284b3c7bd8bb4ec23f0b3a45ac0f10aaaed Mon Sep 17 00:00:00 2001 From: Nischay Ram Mamidi Date: Mon, 31 Jul 2023 08:15:06 -0400 Subject: [PATCH 3/5] update comment of locking numpy version Signed-off-by: Nischay Ram Mamidi --- requirements/app.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/app.in b/requirements/app.in index 398fd7f6c..751eb678a 100644 --- a/requirements/app.in +++ b/requirements/app.in @@ -16,8 +16,8 @@ humanize psycopg2-binary bcrypt pytz -# limit the numpy version to make it compatible with numba==0.56.4, which timely-beliefs >=1.18 depends on (library sktime). -numpy<1.26 +# limit the numpy version to make it compatible with python 3.8, which timely-beliefs >=1.18 depends on (library sktime). +numpy<1.25 isodate click click-default-group From 04db67d723ffd1e4ff12c6ee2f1cab053f316f25 Mon Sep 17 00:00:00 2001 From: Nischay Ram Mamidi Date: Mon, 31 Jul 2023 20:05:46 -0400 Subject: [PATCH 4/5] update comment Signed-off-by: Nischay Ram Mamidi --- requirements/app.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/app.in b/requirements/app.in index 751eb678a..b26e2a80a 100644 --- a/requirements/app.in +++ b/requirements/app.in @@ -16,7 +16,7 @@ humanize psycopg2-binary bcrypt pytz -# limit the numpy version to make it compatible with python 3.8, which timely-beliefs >=1.18 depends on (library sktime). +# limit the numpy version to make it compatible with dependencies in timely-beliefs >=1.18 (libraries sktime, numba). numpy<1.25 isodate click From 42aeba952b2ac85a184036606fdce98e2ca5cc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Tue, 1 Aug 2023 17:50:26 +0200 Subject: [PATCH 5/5] add changelog entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolas Höning --- documentation/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/changelog.rst b/documentation/changelog.rst index 72d46010b..9f941f151 100644 --- a/documentation/changelog.rst +++ b/documentation/changelog.rst @@ -32,6 +32,7 @@ Infrastructure / Support * The endpoint `[POST] /health/ready `_ returns the status of the Redis connection, if configured [see `PR #699 `_] * Document the `device_scheduler` linear program [see `PR #764 `_]. * Add support for `HiGHS `_ solver [see `PR #766 `_]. +* Add support for installing FlexMeasures under Python 3.11 [see `PR #771 `_]. v0.14.2 | July 25, 2023 ============================