Update dependencies, etc. (#269)

* Update dependencies, etc.; update build image

* Update CI

* Fix CI

* Fix 3.10 reference in CI files

* Fix social mkdocs stuff

* Attempt to fix CI

* Add future import annotations stuff

* Remove pyupgrade, get tests working on 3.7

* Fix import sorting

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v1
@@ -42,7 +42,7 @@ jobs:
           key: pytest-${{ matrix.python-version }}
       - name: Check docs build
         # only run this for the python version used by netlify:
-        if: matrix.python-version == 3.7
+        if: matrix.python-version == '3.8'
         run: |
           make docs-build-ci
       - name: Check that formatting, linting, and tests pass

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        python-version: [3.7]
+        python-version: ['3.8']
 
     steps:
       - uses: actions/checkout@v1

.github/workflows/pull-request.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v1
@@ -40,7 +40,7 @@ jobs:
           key: pytest-${{ matrix.python-version }}
       - name: Check docs build
         # only run this for the python version used by netlify:
-        if: matrix.python-version == 3.7
+        if: matrix.python-version == '3.8'
         run: |
           make docs-build-ci
       - name: Check that formatting, linting, and tests pass

.gitignore

@@ -2,6 +2,11 @@
 *.hdf5
 .idea/
 
+env/
+venv/
+.venv/
+env3*/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -86,4 +91,4 @@ venv.bak/
 
 site
 
-.bento/
+.tool-versions

Makefile

@@ -6,10 +6,6 @@ tests_src = tests
 docs_src = docs/src
 all_src = $(pkg_src) $(tests_src)
 
-isort = isort -rc $(all_src)
-autoflake = autoflake -r --remove-all-unused-imports --ignore-init-module-imports $(all_src)
-black = black $(all_src)
-flake8 = flake8 $(all_src)
 mypy_base = mypy --show-error-codes
 mypy = $(mypy_base) $(all_src)
 test = pytest --cov=fastapi_utils
@@ -26,13 +22,15 @@ test:
 
 .PHONY: format  ## Auto-format the source code (isort, autoflake, black)
 format:
-	$(isort)
-	$(autoflake) -i
-	$(black)
+	black $(all_src)
+	black -l 82 $(docs_src)
+	ruff --fix $(all_src)
 
-.PHONY: lint  ## Run flake8 over the application source and tests
+.PHONY: lint
 lint:
-	$(flake8)
+	ruff $(all_src)
+	black --check --diff $(all_src)
+	black -l 82 $(docs_src) --check --diff
 
 .PHONY: mypy  ## Run mypy over the application source and tests
 mypy:
@@ -49,15 +47,7 @@ testcov:
 	fi
 
 .PHONY: ci  ## Run all CI validation steps without making any changes to code
-ci: check-format lint mypy test
-
-.PHONY: check-format  ## Check the source code format without changes
-check-format:
-	$(isort) $(docs_src) --check-only
-	@echo $(autoflake) $(docs_src) --check
-	@( set -o pipefail; $(autoflake) $(docs_src) --check | (grep -v "No issues detected!" || true) )
-	$(black) --check
-	black -l 82 $(docs_src) --check
+ci: lint mypy test
 
 .PHONY: clean  ## Remove temporary and cache files/directories
 clean:
@@ -72,6 +62,7 @@ clean:
 	rm -rf `find . -type d -name .pytest_cache`
 	rm -rf `find . -type d -name .cache`
 	rm -rf `find . -type d -name .mypy_cache`
+	rm -rf `find . -type d -name .ruff_cache`
 	rm -rf `find . -type d -name htmlcov`
 	rm -rf `find . -type d -name "*.egg-info"`
 	rm -rf `find . -type d -name build`

README.md

@@ -28,7 +28,7 @@
 
 ---
 
-<a href="https://fastapi.tiangolo.com">FastAPI</a> is a modern, fast web framework for building APIs with Python 3.6+.
+<a href="https://fastapi.tiangolo.com">FastAPI</a> is a modern, fast web framework for building APIs with Python 3.7+.
 
 But if you're here, you probably already knew that!
 
@@ -59,7 +59,7 @@ See the [docs](https://fastapi-utils.davidmontague.xyz/) for more details and ex
 
 ## Requirements
 
-This package is intended for use with any recent version of FastAPI (depending on `pydantic>=1.0`), and Python 3.6+.
+This package is intended for use with any recent version of FastAPI (depending on `pydantic>=1.0`), and Python 3.7+.
 
 ## Installation
 

docs/index.md

@@ -28,7 +28,7 @@
 
 ---
 
-<a href="https://fastapi.tiangolo.com">FastAPI</a> is a modern, fast web framework for building APIs with Python 3.6+.
+<a href="https://fastapi.tiangolo.com">FastAPI</a> is a modern, fast web framework for building APIs with Python 3.7+.
 
 But if you're here, you probably already knew that!
 
@@ -59,7 +59,7 @@ See the [docs](https://fastapi-utils.davidmontague.xyz/) for more details and ex
 
 ## Requirements
 
-This package is intended for use with any recent version of FastAPI (depending on `pydantic>=1.0`), and Python 3.6+.
+This package is intended for use with any recent version of FastAPI (depending on `pydantic>=1.0`), and Python 3.7+.
 
 ## Installation
 

docs/release-notes.md

@@ -1,5 +1,13 @@
 ## Latest changes
 
+## 0.3.0
+
+* Move to ruff for linting, etc.
+* Update various dependencies
+* Stop supporting Python 3.6
+* Deprecate InferringRouter (as its functionality is now built into `fastapi.APIRouter`)
+* Resolve various deprecationwarnings introduced by sqlalchemy 1.4.
+
 ## 0.2.1
 
 * Fix bug with multiple decorators on same method 

docs/src/camelcase2.py

@@ -1,4 +1,4 @@
-from sqlalchemy.ext.declarative import declarative_base, declared_attr
+from sqlalchemy.orm import declarative_base, declared_attr
 
 from fastapi_utils.camelcase import camel2snake
 

docs/src/class_based_views1.py

@@ -3,7 +3,7 @@
 
 import sqlalchemy as sa
 from fastapi import Depends, FastAPI, Header, HTTPException
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.orm import Session
 from starlette.status import HTTP_403_FORBIDDEN, HTTP_404_NOT_FOUND
 
@@ -35,15 +35,15 @@ class ItemInDB(ItemCreate):
 
 
 def get_jwt_user(authorization: str = Header(...)) -> UserID:
-    """ Pretend this function gets a UserID from a JWT in the auth header """
+    """Pretend this function gets a UserID from a JWT in the auth header"""
 
 
 def get_db() -> Session:
-    """ Pretend this function returns a SQLAlchemy ORM session"""
+    """Pretend this function returns a SQLAlchemy ORM session"""
 
 
 def get_owned_item(session: Session, owner: UserID, item_id: ItemID) -> ItemORM:
-    item: Optional[ItemORM] = session.query(ItemORM).get(item_id)
+    item: Optional[ItemORM] = session.get(ItemORM, item_id)
     if item is not None and item.owner != owner:
         raise HTTPException(status_code=HTTP_403_FORBIDDEN)
     if item is None:

docs/src/class_based_views2.py

@@ -3,8 +3,7 @@
 
 import sqlalchemy as sa
 from fastapi import Depends, FastAPI, Header, HTTPException
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, declarative_base
 from starlette.status import HTTP_403_FORBIDDEN, HTTP_404_NOT_FOUND
 
 from fastapi_utils.api_model import APIMessage, APIModel
@@ -37,15 +36,15 @@ class ItemInDB(ItemCreate):
 
 
 def get_jwt_user(authorization: str = Header(...)) -> UserID:
-    """ Pretend this function gets a UserID from a JWT in the auth header """
+    """Pretend this function gets a UserID from a JWT in the auth header"""
 
 
 def get_db() -> Session:
-    """ Pretend this function returns a SQLAlchemy ORM session"""
+    """Pretend this function returns a SQLAlchemy ORM session"""
 
 
 def get_owned_item(session: Session, owner: UserID, item_id: ItemID) -> ItemORM:
-    item: Optional[ItemORM] = session.query(ItemORM).get(item_id)
+    item: Optional[ItemORM] = session.get(ItemORM, item_id)
     if item is not None and item.owner != owner:
         raise HTTPException(status_code=HTTP_403_FORBIDDEN)
     if item is None:

docs/src/guid1.py

@@ -1,5 +1,5 @@
 import sqlalchemy as sa
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 
 from fastapi_utils.guid_type import GUID
 

docs/src/repeated_tasks1.py

@@ -11,7 +11,7 @@
 
 
 def remove_expired_tokens(db: Session) -> None:
-    """ Pretend this function deletes expired tokens from the database """
+    """Pretend this function deletes expired tokens from the database"""
 
 
 @app.on_event("startup")

docs/src/session1.py

@@ -5,8 +5,7 @@
 import sqlalchemy as sa
 from fastapi import Depends, FastAPI
 from pydantic import BaseSettings
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, declarative_base
 
 from fastapi_utils.guid_type import GUID, GUID_DEFAULT_SQLITE
 from fastapi_utils.session import FastAPISessionMaker
@@ -21,19 +20,19 @@ class User(Base):
 
 
 class DBSettings(BaseSettings):
-    """ Parses variables from environment on instantiation """
+    """Parses variables from environment on instantiation"""
 
     database_uri: str  # could break up into scheme, username, password, host, db
 
 
 def get_db() -> Iterator[Session]:
-    """ FastAPI dependency that provides a sqlalchemy session """
+    """FastAPI dependency that provides a sqlalchemy session"""
     yield from _get_fastapi_sessionmaker().get_db()
 
 
 @lru_cache()
 def _get_fastapi_sessionmaker() -> FastAPISessionMaker:
-    """ This function could be replaced with a global variable if preferred """
+    """This function could be replaced with a global variable if preferred"""
     database_uri = DBSettings().database_uri
     return FastAPISessionMaker(database_uri)
 
@@ -43,6 +42,6 @@ def _get_fastapi_sessionmaker() -> FastAPISessionMaker:
 
 @app.get("/{user_id}")
 def get_user_name(db: Session = Depends(get_db), *, user_id: UUID) -> str:
-    user = db.query(User).get(user_id)
+    user = db.get(User, user_id)
     username = user.name
     return username

docs/user-guide/basics/guid-type.md

@@ -54,7 +54,7 @@ you can use `fastapi_utils.guid_type.GUID_SERVER_DEFAULT_POSTGRESQL`:
 
 ```python
 import sqlalchemy as sa
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 
 from fastapi_utils.guid_type import GUID, GUID_SERVER_DEFAULT_POSTGRESQL
 
@@ -89,7 +89,7 @@ create new records):
 
 ```python
 import sqlalchemy as sa
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 
 from fastapi_utils.guid_type import GUID, GUID_DEFAULT_SQLITE
 

fastapi_utils/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.3.0"

fastapi_utils/api_model.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from functools import partial
 
 from pydantic import BaseConfig, BaseModel

fastapi_utils/api_settings.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from functools import lru_cache
-from typing import Any, Dict
+from typing import Any
 
 from pydantic import BaseSettings
 
@@ -31,14 +33,14 @@ class APISettings(BaseSettings):
     disable_docs: bool = False
 
     @property
-    def fastapi_kwargs(self) -> Dict[str, Any]:
+    def fastapi_kwargs(self) -> dict[str, Any]:
         """
         This returns a dictionary of the most commonly used keyword arguments when initializing a FastAPI instance
 
         If `self.disable_docs` is True, the various docs-related arguments are disabled, preventing your spec from being
         published.
         """
-        fastapi_kwargs: Dict[str, Any] = {
+        fastapi_kwargs: dict[str, Any] = {
             "debug": self.debug,
             "docs_url": self.docs_url,
             "openapi_prefix": self.openapi_prefix,

fastapi_utils/camelcase.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re