Update linting and ci/cd from 2022 to 2023 versions

.editorconfig

@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,css,scss,json,yml,tpl,js,jsx}]
+[*.{html,css,scss,json,yml,tpl,js,jsx,toml}]
 indent_style = space
 indent_size = 2
 

.github/workflows/coverage.yml

@@ -20,7 +20,7 @@ jobs:
         mongodb-version: [5.0]
         include:
           - name: "coverage"
-            python: "3.10"
+            python: "3.11"
 
     steps:
     - uses: actions/checkout@v3
@@ -33,7 +33,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install nox virtualenv
     - name: Start MongoDB
-      uses: supercharge/mongodb-github-action@1.7.0
+      uses: supercharge/mongodb-github-action@v1.10.0
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
     - name: Test build
@@ -43,7 +43,7 @@ jobs:
       with:
         file: ./coverage.xml
     - name: Send coverage report to codeclimate
-      uses: paambaati/codeclimate-action@v3.0.0
+      uses: paambaati/codeclimate-action@v5.0.0
       continue-on-error: true
       with:
         coverageCommand: echo "Ignore rerun"

.github/workflows/linting.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         include:
           - name: "linting"
-            python: "3.7"
+            python: "3.11"
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/tests.yml

@@ -16,8 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mongodb-version: ["3.6", "4.0", "4.2", "4.4", "5.0"]
-        python: ["3.7", "3.8", "3.9", "3.10", "pypy3.7"]
+        mongodb-version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0"]
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11.", "pypy3.7", "pypy3.8", "pypy3.9"]
 
     steps:
     - uses: actions/checkout@v3
@@ -30,7 +30,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install nox virtualenv
     - name: Start MongoDB
-      uses: supercharge/mongodb-github-action@1.7.0
+      uses: supercharge/mongodb-github-action@v1.10.0
       with:
         mongodb-version: ${{ matrix.mongodb-version }}
     - name: Test build

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -24,23 +24,23 @@ repos:
         args: [--remove]
       - id: mixed-line-ending
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.7.0
     hooks:
       - id: black
-        language_version: python3.7
+        language_version: python3.11
         exclude: ^docs/
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 4.0.1
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
     hooks:
       - id: flake8
         exclude: ^docs/|^examples/
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.31.1
+    rev: v0.35.0
     hooks:
       - id: markdownlint
         args: [-f]
         exclude: ^(.github|tests)
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort

README.md

@@ -105,6 +105,4 @@ Flask-MongoEngine is distributed under [BSD 3-Clause License].
 
 [Contribution guidelines]: CONTRIBUTING.md
 
-[nox]: https://nox.thea.codes/en/stable/usage.html
-
 [complete connection settings description]: http://docs.mongoengine.org/projects/flask-mongoengine/flask_config.html

docs/db_model.md

@@ -2,9 +2,9 @@
 
 ```{important}
 Flask-Mongoengine does not adjust database level behaviour of [mongoengine] fields
-definition, except [keyword only definition] requirement. Everything other on
-database level match [mongoengine] project. All parent methods, arguments (as
-keyword arguments) and keyword arguments are supported.
+definition, except [keyword only definition](#keyword-only-definition) requirement.
+Everything other on database level match [mongoengine] project. All parent methods,
+arguments (as keyword arguments) and keyword arguments are supported.
 
 If you are not intend to use WTForms integration, you are free to use fields classes
 from parent [mongoengine] project; this should not break anything.
@@ -44,4 +44,3 @@ check issue [#379] as example of one of such cases.
 [mongoengine]: https://docs.mongoengine.org/
 [#379]: https://github.com/MongoEngine/flask-mongoengine/issues/379
 [integration]: forms
-[keyword only definition]: #keyword-only-definition

docs/forms.md

@@ -30,7 +30,7 @@ This allows to create several forms for same model, for different circumstances.
 
 ## Requirements
 
-For correct integration behavior several requirements should be met:
+For correct [integration] behavior several requirements should be met:
 
 - Document classes should be used from Flask-Mongoengine
   {class}`flask_mongoengine.MongoEngine` class, or from
@@ -41,7 +41,7 @@ For correct integration behavior several requirements should be met:
 
 ## Global transforms
 
-For all fields, processed by Flask-Mongoengine integration:
+For all fields, processed by Flask-Mongoengine [integration]:
 
 - If model field definition have {attr}`wtf_validators` defined, they will be
   forwarded to WTForm as {attr}`validators`. This is not protection from
@@ -1038,8 +1038,6 @@ Not yet documented. Please help us with new pull request.
 
 [mongoengine]: https://docs.mongoengine.org/
 
-[#379]: https://github.com/MongoEngine/flask-mongoengine/issues/379
-
 [integration]: forms
 
 [global transforms]: #global-transforms

flask_mongoengine/pagination.py

@@ -9,7 +9,6 @@
 
 class Pagination(object):
     def __init__(self, iterable, page, per_page):
-
         if page < 1:
             abort(404)
 

flask_mongoengine/wtf/fields.py

@@ -144,7 +144,6 @@ def __init__(
         blank_text="---",
         **kwargs,
     ):
-
         super(QuerySetSelectMultipleField, self).__init__(
             label, validators, queryset, label_attr, allow_blank, blank_text, **kwargs
         )

noxfile.py

@@ -42,14 +42,16 @@ def base_install(session, flask, mongoengine, toolbar, wtf):
     return session
 
 
-@nox.session(python="3.7")
+@nox.session(python="3.11")
 def lint(session):
     """Run linting check locally."""
     session.install("pre-commit")
     session.run("pre-commit", "run", "-a")
 
 
-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "pypy3.7"])
+@nox.session(
+    python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8", "pypy3.9"]
+)
 @nox.parametrize("flask", ["==1.1.4", "==2.0.3", ">=2.1.2"])
 @nox.parametrize("mongoengine", ["==0.21.0", "==0.22.1", "==0.23.1", ">=0.24.1"])
 @nox.parametrize("toolbar", [True, False])
@@ -78,7 +80,9 @@ def _run_in_docker(session):
         session.run_always("docker", "rm", "-fv", "nox_docker_test", external=True)
 
 
-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "pypy3.7"])
+@nox.session(
+    python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8", "pypy3.9"]
+)
 @nox.parametrize("flask", ["==1.1.4", "==2.0.3", ">=2.1.2"])
 @nox.parametrize("mongoengine", ["==0.21.0", "==0.22.1", "==0.23.1", ">=0.24.1"])
 @nox.parametrize("toolbar", [True, False])
@@ -89,12 +93,14 @@ def full_tests(session, flask, mongoengine, toolbar, wtf):
     _run_in_docker(session)
 
 
-@nox.session(python=["3.7", "3.8", "3.9", "3.10", "pypy3.7"])
+@nox.session(
+    python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7", "pypy3.8", "pypy3.9"]
+)
 @nox.parametrize("toolbar", [True, False])
 @nox.parametrize("wtf", [True, False])
 def latest(session, toolbar, wtf):
     """Run minimum tests for checking minimum code quality."""
-    flask = ">=2.1.2"
+    flask = "==2.1.3"
     mongoengine = ">=0.24.1"
     session = base_install(session, flask, mongoengine, toolbar, wtf)
     if session.interactive:
@@ -103,13 +109,13 @@ def latest(session, toolbar, wtf):
         session.run("pytest", *session.posargs)
 
 
-@nox.session(python="3.10")
+@nox.session(python="3.11")
 def documentation_tests(session):
     """Run documentation tests."""
     return docs(session, batch_run=True)
 
 
-@nox.session(python="3.10")
+@nox.session(python="3.11")
 def docs(session, batch_run: bool = False):
     """Build the documentation or serve documentation interactively."""
     shutil.rmtree(Path("docs").joinpath("_build"), ignore_errors=True)

pyproject.toml

@@ -3,7 +3,7 @@ name = "flask-mongoengine"
 description = "Flask extension that provides integration with MongoEngine and WTF model forms."
 readme = "README.md"
 requires-python = ">=3.7"
-license = {text = "BSD 3-Clause License"}
+license = { text = "BSD 3-Clause License" }
 classifiers = [
   "Development Status :: 4 - Beta",
   "Environment :: Web Environment",
@@ -17,6 +17,7 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Programming Language :: Python :: Implementation :: CPython",
   "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
@@ -39,18 +40,18 @@ keywords = [
   "extension"
 ]
 authors = [
-  {name = "Ross Lawley", email = "ross.lawley@gmail.com"}
+  { name = "Ross Lawley", email = "ross.lawley@gmail.com" }
 ]
 maintainers = [
-  {name = "Andrey Shpak", email = "ashpak@ashpak.ru"}
+  { name = "Andrey Shpak", email = "ashpak@ashpak.ru" }
 ]
 dynamic = ["version"]
 
 [project.optional-dependencies]
 wtf = ["WTForms[email]>=3.0.0", "Flask-WTF>=0.14.3"]
 toolbar = ["Flask-DebugToolbar>=0.11.0"]
 dev = [
-  "black==22.6.0",
+  "black==23.7.0",
   "pre-commit",
   "pytest",
   "pytest-cov",
@@ -85,10 +86,10 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools]
 zip-safe = false
 platforms = ["any"]
-packages=["flask_mongoengine", "flask_mongoengine.wtf"]
+packages = ["flask_mongoengine", "flask_mongoengine.wtf"]
 
 [tool.setuptools.dynamic]
-version = {attr = "flask_mongoengine._version.version"}
+version = { attr = "flask_mongoengine._version.version" }
 
 [tool.setuptools_scm]
 write_to = "flask_mongoengine/_version.py"
@@ -125,6 +126,7 @@ testpaths = ["tests"]
 filterwarnings = [
   "error",
   "ignore::ResourceWarning",
+  "ignore::DeprecationWarning",
   "ignore::DeprecationWarning:flask_mongoengine",
   "ignore::DeprecationWarning:tests",
-  ]
+]

tests/test_db_fields.py

@@ -70,7 +70,6 @@ def test__get_fields_names__is_called_by_to_wtf_form_call(
     def test__get_fields_names__hold_correct_fields_ordering_for_only(
         self, TempDocument
     ):
-
         field_names = TempDocument._get_fields_names(
             only=["field_five", "field_one"], exclude=None
         )

tests/test_forms.py

@@ -15,7 +15,6 @@
 
 
 def test_binaryfield(app, db):
-
     with app.test_request_context("/"):
 
         class Binary(db.Document):
@@ -28,9 +27,7 @@ class Binary(db.Document):
 
 
 def test_choices_coerce(app, db):
-
     with app.test_request_context("/"):
-
         CHOICES = ((1, "blue"), (2, "red"))
 
         class MyChoices(db.Document):
@@ -44,9 +41,7 @@ class MyChoices(db.Document):
 
 
 def test_list_choices_coerce(app, db):
-
     with app.test_request_context("/"):
-
         CHOICES = ((1, "blue"), (2, "red"))
 
         class MyChoices(db.Document):
@@ -60,7 +55,6 @@ class MyChoices(db.Document):
 
 
 def test_emailfield(app, db):
-
     with app.test_request_context("/"):
 
         class Email(db.Document):
@@ -343,7 +337,6 @@ class DogOwner(db.Document):
 
 def test_modelradiofield(app, db):
     with app.test_request_context("/"):
-
         choices = [("male", "Male"), ("female", "Female"), ("other", "Other")]
 
         class Poll(db.Document):
@@ -383,7 +376,6 @@ class User(db.Document):
 
 
 def test_unique_with(app, db):
-
     with app.test_request_context("/"):
 
         class Item(db.Document):

tests/test_json.py

@@ -49,12 +49,14 @@ class DummyEncoder(flask.json.JSONEncoder):
     """
 
 
-DummyProvider = None
 if use_json_provider():
 
     class DummyProvider(flask.json.provider.DefaultJSONProvider):
         """Dummy Provider, to test correct MRO in new flask versions."""
 
+else:
+    DummyProvider = None
+
 
 @pytest.mark.skipif(condition=use_json_provider(), reason="New flask use other test")
 @pytest.mark.usefixtures("extended_db")

tests/test_pagination.py

@@ -65,7 +65,6 @@ def _test_paginator(paginator):
     assert [1, 2, 3, 4, 5] == list(paginator.iter_pages())
 
     for i in [1, 2, 3, 4, 5]:
-
         if i == 1:
             assert not paginator.has_prev
             with pytest.raises(NotFound):

tests/test_session.py

@@ -7,7 +7,6 @@
 
 @pytest.fixture(autouse=True)
 def setup_endpoints(app, db):
-
     app.session_interface = MongoEngineSessionInterface(db)
 
     @app.route("/")