Merge branch 'master' into flask-scaffold_567

Ryu-CZ · Oct 25, 2023 · 1d6bc32 · 1d6bc32
2 parents 13ac54e + e912d3d
commit 1d6bc32
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -35,7 +35,8 @@ Bug Fixes
 ::
 
    * Fixing test as HTTP Header MIMEAccept expects quality-factor number in form of `X.X` (#547) [chipndell]
-   * Fixing flask 3.0+ compatibility of `flask.scaffold import _endpoint_from_view_func` Import error. (#565) [Ryu-CZ]
+   * Introduce temporary restrictions on some package versions. (`flask<3.0.0`, `werkzeug<3.0.0`, `jsonschema<=4.17.3`) [peter-doggart]
+
 
 .. _enhancements-1.2.0:
 

diff --git 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

diff --git a/flask_restx/__about__.py b/flask_restx/__about__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.1.1.dev"
+__version__ = "1.2.1.dev"
 __description__ = (
     "Fully featured framework for fast, easy and documented API development with Flask"
 )
diff --git 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