Skip to content

Commit

Permalink
Merge 55f5090 into b706aea
Browse files Browse the repository at this point in the history
  • Loading branch information
jace committed May 20, 2024
2 parents b706aea + 55f5090 commit dbaef67
Show file tree
Hide file tree
Showing 68 changed files with 2,871 additions and 1,674 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
39 changes: 4 additions & 35 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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
Expand All @@ -13,35 +13,7 @@ repos:
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:
Expand All @@ -56,6 +28,7 @@ repos:
]
additional_dependencies:
- flask
- quart
- lxml-stubs
- sqlalchemy
- toml
Expand All @@ -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:
Expand All @@ -88,6 +56,7 @@ repos:
]
additional_dependencies:
- flask
- quart
- sqlalchemy
- tomli
- repo: https://github.com/PyCQA/bandit
Expand Down
8 changes: 7 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.8.0 - Unreleased
------------------

* Added async support and cross-compatibility between Flask and Quart
* Dropped obsolete modules

0.7.0 - Unreleased
------------------

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
21 changes: 9 additions & 12 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions docs/compat.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.. automodule:: coaster.compat
:members:
21 changes: 0 additions & 21 deletions docs/db.rst

This file was deleted.

3 changes: 1 addition & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
==================
Expand Down
2 changes: 0 additions & 2 deletions docs/nlp.rst

This file was deleted.

Loading

0 comments on commit dbaef67

Please sign in to comment.