From 40d34abacc3fd3b747fd5d4d4e364c8fd2aa34ff Mon Sep 17 00:00:00 2001 From: Peter Doggart Date: Sat, 21 Oct 2023 11:13:57 +0000 Subject: [PATCH 1/4] Fix package versions and change pytest-flask dependency. --- CHANGELOG.rst | 2 ++ requirements/install.pip | 6 +++--- requirements/test.pip | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 73eea75a..72fda664 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -35,6 +35,8 @@ Bug Fixes :: * Fixing test as HTTP Header MIMEAccept expects quality-factor number in form of `X.X` (#547) [chipndell] + * Introduce temporary restrictions on some package versions. (`flask<3.0.0`, `werkzeug<3.0.0`, `jsonschema<=4.17.3`) [peter-doggart] + * Introduce temporary dependency on a personal fork of `pytest-flask` until upstream fixes compatibility with `flask>=3.0.0` [peter-doggart] .. _enhancements-1.2.0: diff --git a/requirements/install.pip b/requirements/install.pip index e429bf27..630cb191 100644 --- a/requirements/install.pip +++ b/requirements/install.pip @@ -1,6 +1,6 @@ aniso8601>=0.82 -jsonschema -Flask>=0.8, !=2.0.0 -werkzeug !=2.0.0 +jsonschema<=4.17.3 +Flask>=0.8, !=2.0.0, <3.0.0 +werkzeug!=2.0.0, <3.0.0 pytz importlib_resources diff --git a/requirements/test.pip b/requirements/test.pip index f093d4b9..5e5e98ef 100644 --- a/requirements/test.pip +++ b/requirements/test.pip @@ -4,7 +4,7 @@ mock==3.0.5 pytest==7.0.1 pytest-benchmark==3.4.1 pytest-cov==4.0.0 -pytest-flask==1.2.0 +git+https://github.com/peter-doggart/pytest-flask-temp.git@remove-request-ctx#egg=pytest-flask pytest-mock==3.6.1 pytest-profiling==1.7.0 tzlocal From ddd9c7149ebaf43e012123f3a533d902ea963038 Mon Sep 17 00:00:00 2001 From: Peter Doggart Date: Sat, 21 Oct 2023 11:18:50 +0000 Subject: [PATCH 2/4] Update readme. --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 5359bfbb..be832e8b 100644 --- a/README.rst +++ b/README.rst @@ -60,10 +60,10 @@ Flask and Werkzeug moved to versions 2.0 in March 2020. This caused a breaking c - < 2.0.0 - pinned in Flask-RESTX. * - >= 0.5.0 - - All (For Now) + - < 3.0.0 - unpinned, import statements wrapped for compatibility * - trunk branch in Github - - All (and updated more often) + - < 3.0.0 (Flask >=3.0.0 support is in progress, see https://github.com/python-restx/flask-restx/issues/566) - unpinned, will address issues faster than releases. Installation From 7fe9b876907f961772b7a1c05e4037a0d120a43e Mon Sep 17 00:00:00 2001 From: Peter Doggart Date: Sat, 21 Oct 2023 11:31:40 +0000 Subject: [PATCH 3/4] Change how package is defined in test.pip --- requirements/test.pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.pip b/requirements/test.pip index 5e5e98ef..4b66cbc9 100644 --- a/requirements/test.pip +++ b/requirements/test.pip @@ -4,7 +4,7 @@ mock==3.0.5 pytest==7.0.1 pytest-benchmark==3.4.1 pytest-cov==4.0.0 -git+https://github.com/peter-doggart/pytest-flask-temp.git@remove-request-ctx#egg=pytest-flask +pytest-flask@git+https://github.com/peter-doggart/pytest-flask-temp.git@remove-request-ctx pytest-mock==3.6.1 pytest-profiling==1.7.0 tzlocal From f323b67c2174b902a2ad9ff1bf6c57c2b27ebdec Mon Sep 17 00:00:00 2001 From: Peter Doggart Date: Sat, 21 Oct 2023 11:42:45 +0000 Subject: [PATCH 4/4] Undo pytest changes. --- CHANGELOG.rst | 1 - requirements/test.pip | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 72fda664..b52c95b3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -36,7 +36,6 @@ Bug Fixes * Fixing test as HTTP Header MIMEAccept expects quality-factor number in form of `X.X` (#547) [chipndell] * Introduce temporary restrictions on some package versions. (`flask<3.0.0`, `werkzeug<3.0.0`, `jsonschema<=4.17.3`) [peter-doggart] - * Introduce temporary dependency on a personal fork of `pytest-flask` until upstream fixes compatibility with `flask>=3.0.0` [peter-doggart] .. _enhancements-1.2.0: diff --git a/requirements/test.pip b/requirements/test.pip index 4b66cbc9..f093d4b9 100644 --- a/requirements/test.pip +++ b/requirements/test.pip @@ -4,7 +4,7 @@ mock==3.0.5 pytest==7.0.1 pytest-benchmark==3.4.1 pytest-cov==4.0.0 -pytest-flask@git+https://github.com/peter-doggart/pytest-flask-temp.git@remove-request-ctx +pytest-flask==1.2.0 pytest-mock==3.6.1 pytest-profiling==1.7.0 tzlocal