diff --git a/CHANGES b/CHANGES index d793cb16..86eaea9c 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ Changelog Changes in Flask-Restless-NG ============================ +Version 2.5.1 (2023-22-15): +- Restricted SQLAlchemy to <2.0. Support of 2.0 requires significant changes and will be a major release + Version 2.5.0 (2022-12-24): - Added support for X-Forwarded- headers (pagination links now use the original host/proto) (#38) diff --git a/README.md b/README.md index ff78d132..5ea2219e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This is a fork of [Flask-Restless](https://github.com/jfinkels/flask-restless) m Version `1.0.*` of `Flask-Restless-NG` is fully API compatible with `Flask-Restless` version `1.0.0b1` with the following improvements: - * Supports Flask 1.0+ and SQLAlchemy 1.3+ + * Supports Flask 1.0+ and SQLAlchemy 1.3-1.4 (2.x is not supported yet) * 2-5x faster serialization of JSON responses. * Miscellaneous bugs fixed diff --git a/flask_restless/__init__.py b/flask_restless/__init__.py index dd41dfc8..e09eef9e 100644 --- a/flask_restless/__init__.py +++ b/flask_restless/__init__.py @@ -1,7 +1,7 @@ # Copyright 2011 Lincoln de Sousa . # Copyright 2012, 2013, 2014, 2015, 2016 Jeffrey Finkelstein # and contributors. -# Copyright 2020, 2021, 2022 Maksym Revutskyi and contributors. +# Copyright 2020, 2021, 2022, 2023 Maksym Revutskyi and contributors. # # This file is part of Flask-Restless-NG. # @@ -13,7 +13,7 @@ """ #: The current version of this extension. -__version__ = '2.5.0' +__version__ = '2.5.1' # The following names are available as part of the public API for Flask-Restless-NG. diff --git a/requirements/dev.txt b/requirements/dev.txt index 7a41ab74..ee433fd2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,6 +1,6 @@ flask>=1.0 flask-sqlalchemy>=0.10 -sqlalchemy>=1.2 +sqlalchemy>=1.3,<2.0 python-dateutil>2.2 setuptools>=65.5.1 diff --git a/setup.py b/setup.py index cc99b54b..7b065164 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ #: required, so the user must install it explicitly. REQUIREMENTS = [ 'flask>=1.0', - 'sqlalchemy>=1.3.6', + 'sqlalchemy>=1.3.6,<2.0', 'python-dateutil>2.2', ] @@ -83,6 +83,7 @@ def find_version(*file_path): 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Topic :: Database :: Front-Ends', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules'