From a1f1323f63f59760e430001efef43af9b829ebed Mon Sep 17 00:00:00 2001 From: Brian Cappello Date: Sat, 2 Apr 2022 18:27:09 -0600 Subject: [PATCH] require python 3.8+ --- .readthedocs.yml | 2 +- .travis.yml | 2 +- docs/index.rst | 2 +- docs/tutorial/index.rst | 2 +- flask_unchained/bundles/controller/utils.py | 2 +- flask_unchained/unchained.py | 2 +- requirements.txt | 22 ++++++++++----------- setup.py | 10 +++++----- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index ec8a17d..a079daf 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,7 +2,7 @@ build: image: latest python: - version: 3.7 + version: 3.8 setup_py_install: true requirements_file: requirements-dev.txt diff --git a/.travis.yml b/.travis.yml index ced6d44..8dc6af1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,9 @@ env: language: python python: - - 3.7 - 3.8 - 3.9 + - 3.10 services: - postgresql diff --git a/docs/index.rst b/docs/index.rst index aac3428..8993f0d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -28,7 +28,7 @@ Flask Unchained aims to improve your development experience by using simple, con Install Flask Unchained ----------------------- -Requires **Python 3.7+** +Requires **Python 3.8+** .. code:: shell diff --git a/docs/tutorial/index.rst b/docs/tutorial/index.rst index e87e9d4..9ac079f 100644 --- a/docs/tutorial/index.rst +++ b/docs/tutorial/index.rst @@ -9,7 +9,7 @@ This tutorial will walk you from Hello World through building a fully-featured q It is assumed you're already familiar with: -- Python 3.7+. The `official tutorial `_ is a great way to learn or review. +- Python 3.8+. The `official tutorial `_ is a great way to learn or review. - The Jinja2 templating engine. See the `official docs `_ for more info. **Table of Contents** diff --git a/flask_unchained/bundles/controller/utils.py b/flask_unchained/bundles/controller/utils.py index 7e14c0c..27332c8 100644 --- a/flask_unchained/bundles/controller/utils.py +++ b/flask_unchained/bundles/controller/utils.py @@ -49,7 +49,7 @@ def to_url(self, value): def controller_name( - cls: Union[Type[object], str], # FIXME Union[Type[Controller], str] on 3.7+ + cls: Union[Type[object], str], # FIXME Union[Type[Controller], str] _remove_suffixes: Optional[Union[List[str], Tuple[str, ...]]] = None, ) -> str: """ diff --git a/flask_unchained/unchained.py b/flask_unchained/unchained.py index 059c8c3..132e02e 100644 --- a/flask_unchained/unchained.py +++ b/flask_unchained/unchained.py @@ -201,7 +201,7 @@ def __init__(self, env: Optional[Union[DEV, PROD, STAGING, TEST]] = None): def init_app(self, app: Flask, - bundles: Optional[List] = None, # FIXME Optional[List[Bundle]] on 3.7+ + bundles: Optional[List[object]] = None, # FIXME Optional[List[Bundle]] unchained_config: Optional[Dict[str, Any]] = None, ) -> None: # deferred import to prevent circular dependency diff --git a/requirements.txt b/requirements.txt index f3a030b..b74c3a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ alembic==1.7.5 -apispec==4.7.1 +apispec==5.1.1 apispec_webframeworks==0.5.2 bcrypt==3.2.0 beautifulsoup4==4.10.0 blinker==1.4 celery==5.2.1 -click==8.0.3 +click==8.1.2 dill==0.3.4 email-validator==1.1.3 -flask==2.0.2 -flask-admin==1.5.8 +flask==2.1.1 +flask-admin==1.6.0 flask_babelex==0.9.4 flask-graphql==2.0.1 flask-login==0.5.0 @@ -20,8 +20,8 @@ flask-principal==0.4.0 flask-session==0.4.0 flask-sqlalchemy==2.5.1 flask-sqlalchemy-unchained==0.7.6 -flask-wtf==1.0.0 -graphene==2.1.8 +flask-wtf==1.0.1 +graphene==2.1.9 graphene-sqlalchemy==2.3.0 graphql-core>=2.3.2,<3 graphql-relay>=2.0.1,<3 @@ -29,13 +29,13 @@ graphql-server-core>=1.2.0,<2 IPython==7.30.0 itsdangerous==2.0.1 jedi==0.18.1 -jinja2==3.0.3 +jinja2==3.1.1 kombu==5.2.2 -lxml==4.6.4 +lxml==4.8.0 markupsafe==2.0.1 marshmallow==3.14.1 marshmallow-sqlalchemy==0.26.1 -networkx==2.5.1 +networkx==2.7.1 passlib==1.7.4 py-meta-utils==0.7.8 py-yaml-fixtures==0.6.1 @@ -43,6 +43,6 @@ pyterminalsize speaklater==1.3 sqlalchemy==1.3.24 sqlalchemy-unchained==0.12.2 -werkzeug==2.0.2 -wtforms==3.0.0 +werkzeug==2.1.1 +wtforms==3.0.1 wtforms_sqlalchemy==0.3 diff --git a/setup.py b/setup.py index 5e699f5..c337a32 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ py_modules=['flask_mail'], include_package_data=True, zip_safe=False, - python_requires='>=3.7', + python_requires='>=3.8', install_requires=[ 'blinker>=1.4', 'click>=8.0.1', @@ -28,7 +28,7 @@ 'flask-wtf>=1.0.0', 'py-meta-utils>=0.7.8', 'pyterminalsize>=0.1.0', - 'networkx>=2.5', + 'networkx>=2.7.1', 'werkzeug>=2.0.1', 'wtforms>=3.0.0', 'email-validator>=1.1.3', @@ -38,7 +38,7 @@ 'flask-admin>=1.5.8', ], 'api': [ - 'apispec>=4.5.0,<5', + 'apispec>=5.1.1', 'apispec-webframeworks>=0.5.2', 'flask-marshmallow>=0.14.0', 'marshmallow>=3.14.1', @@ -68,7 +68,7 @@ 'graphql-relay>=2.0.1,<3', 'graphql-server-core>=1.2.0,<2', 'flask-graphql>=2.0', - 'graphene>=2.1.8,<3', + 'graphene>=2.1.9,<3', 'graphene-sqlalchemy>=2.2.2,<3', ], 'mail': [ @@ -106,9 +106,9 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], entry_points=''' [console_scripts]