hasgeek · jace · May 26, 2024 · May 13, 2024 · May 15, 2024 · May 15, 2024
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -63,7 +63,7 @@ jobs:
           psql -h localhost -U postgres coaster_test -c "grant all privileges on schema public to $(whoami); grant all privileges on all tables in schema public to $(whoami); grant all privileges on all sequences in schema public to $(whoami);"
       - name: Test with pytest
         run: |
-          pytest --ignore-flaky --showlocals --cov=coaster
+          pytest --showlocals --cov=coaster
       - name: Prepare coverage report
         run: |
           mkdir -p coverage

diff --git a/.gitignore b/.gitignore
@@ -19,5 +19,4 @@ __pycache__
 .mypy_cache
 .cache
 .vscode
-coverage/
 monkeytype.sqlite3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,47 +1,19 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 ci:
-  skip: ['yesqa', 'no-commit-to-branch']
+  skip: ['no-commit-to-branch']
 repos:
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: ['--keep-runtime-typing', '--py39-plus']
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.4.5
     hooks:
       - id: ruff
         args: ['--fix', '--exit-non-zero-on-fix']
-        # Extra args, only after removing flake8 and yesqa: '--extend-select', 'RUF100'
-  - repo: https://github.com/asottile/yesqa
-    rev: v1.5.0
-    hooks:
-      - id: yesqa
-        additional_dependencies: &flake8deps
-          - flake8-assertive
-          # - flake8-annotations
-          - flake8-blind-except
-          - flake8-builtins
-          - flake8-comprehensions
-          # - flake8-docstrings
-          - flake8-isort
-          - flake8-logging-format
-          - flake8-mutable
-          - flake8-print
-          - pep8-naming
-          - toml
-          - tomli
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        additional_dependencies:
-          - tomli
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
+      - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.10.0
     hooks:
@@ -56,6 +28,7 @@ repos:
           ]
         additional_dependencies:
           - flask
+          - quart
           - lxml-stubs
           - sqlalchemy
           - toml
@@ -66,11 +39,6 @@ repos:
           - types-requests
           - types-toml
           - typing-extensions
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies: *flake8deps
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
@@ -88,6 +56,7 @@ repos:
           ]
         additional_dependencies:
           - flask
+          - quart
           - sqlalchemy
           - tomli
   - repo: https://github.com/PyCQA/bandit

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+0.8.0 - Unreleased
+------------------
+
+* Added async support and cross-compatibility between Flask and Quart
+* Dropped obsolete modules ``db``, ``gfm`` and ``nlp``
+
 0.7.0 - Unreleased
 ------------------
 
@@ -20,7 +26,7 @@
   repeat already logged values
 * Dropped deprecated declared_attr_roles and set_roles
 * Added ``__json__`` protocol in ``RoleMixin``
-* Remove unicode_http_header
+* Removed unicode_http_header
 * ``loader`` and ``after_loader`` are deprecated in ``coaster.views.ModelView``
   in favour of a unified ``load`` method
 * ``coaster.db`` is deprecated as Flask-SQLAlchemy 3.0 has changed architecture

diff --git a/README.rst b/README.rst
@@ -1,9 +1,9 @@
-Coaster: common patterns for Flask apps
-=======================================
+Coaster: common patterns for Flask and Quart apps
+=================================================
 
 |docs| |travis| |coveralls| |deepsource|
 
-Coaster contains functions and db models for recurring patterns in Flask
+Coaster contains functions and db models for recurring patterns in Flask and Quart
 apps. Documentation is at https://coaster.readthedocs.org/. Coaster requires
 Python 3.9 or later.
 

diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,15 +1,12 @@
-flake8
-flake8-assertive
-flake8-blind-except
-flake8-builtins
-flake8-coding
-flake8-comprehensions
-flake8-isort
-flake8-logging-format
-flake8-mutable
-flake8-print>=5.0.0
-isort
-pep8-naming
+mypy
 pre-commit
 pylint
+ruff
 toml
+types-bleach
+types-Markdown
+types-pytz
+types-PyYAML
+types-requests
+types-toml
+typing-extensions
diff --git a/docs/compat.rst b/docs/compat.rst
@@ -0,0 +1,2 @@
+.. automodule:: coaster.compat
+   :members:
diff --git a/docs/db.rst b/docs/db.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -24,8 +24,7 @@ Coaster is available under the BSD license, the same license as Flask.
    auth
    views/index
    sqlalchemy/index
-   db
-   nlp
+   compat
 
 Indices and tables
 ==================

diff --git a/docs/nlp.rst b/docs/nlp.rst
diff --git a/docs/sqlalchemy/index.rst b/docs/sqlalchemy/index.rst
@@ -5,6 +5,8 @@
 
    model
    mixins
+   query
+   pagination
    columns
    functions
    roles

diff --git a/docs/sqlalchemy/pagination.rst b/docs/sqlalchemy/pagination.rst
@@ -0,0 +1,2 @@
+.. automodule:: coaster.sqlalchemy.pagination
+   :members:
diff --git a/docs/sqlalchemy/query.rst b/docs/sqlalchemy/query.rst
@@ -0,0 +1,2 @@
+.. automodule:: coaster.sqlalchemy.query
+   :members: