Update dependencies, etc.

Author: dmontagu

.gitignore

@@ -2,6 +2,11 @@
 *.hdf5
 .idea/
 
+env/
+venv/
+.venv/
+env3*/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

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,13 @@ test:
 
 .PHONY: format  ## Auto-format the source code (isort, autoflake, black)
 format:
-	$(isort)
-	$(autoflake) -i
-	$(black)
+	black $(all_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)
 
 .PHONY: mypy  ## Run mypy over the application source and tests
 mypy:
@@ -72,6 +68,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`

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 (due to inability to run in GitHub actions)
+* 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
 
@@ -43,7 +43,7 @@ def get_db() -> 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
@@ -45,7 +44,7 @@ def get_db() -> 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/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
@@ -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"