Merge pull request #110 from stckme/remove_autorollback

Removed deprecated autorollback

.github/workflows/tests.yml

@@ -29,13 +29,14 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.12
+          python-version: 3.9
           cache: "pip"
           cache-dependency-path: "**/requirements_dev.txt"
       - name: Run tests
         run: |
           export SETTINGS_DIR=.
           pip install -r requirements_dev.txt
           pip install -e .
-          # pre-commit run --all-files  TODO: check what's wrong in CI
+          pre-commit run --all-files
           pytest fastapi_tests
+          pytest tests

.pre-commit-config.yaml

@@ -1,28 +1,18 @@
-exclude: ^(data/|app/templates/|tests/data)
 repos:
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        args:
-          - --profile=black
-          - --filter-files
-          - --force-grid-wrap=3
-
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 24.8.0
     hooks:
       - id: black
         language_version: python3
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.1.1
     hooks:
       - id: flake8
         language_version: python3
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v5.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

.travis.yml

@@ -16,9 +16,6 @@ install:
 
 before_script:
   - psql -c 'create database defaultdb;' -U postgres
-  #- hug -f tests/service.py &
-  - gunicorn tests.service:__hug_wsgi__ -D
-  - sleep 2
 
 script: tox
 

CHANGELOG.rst

@@ -2,6 +2,10 @@
 History
 =======
 
+0.96.2 (2024-10-07)
+-------------------
+* Removed deprecated peewee autorollback option.
+
 0.96.1 (2024-09-26)
 -------------------
 * Added annotated fastapi dependencies.

CONTRIBUTING.rst

@@ -83,7 +83,6 @@ Ready to contribute? Here's how to set up `apphelpers` for local development.
 
    $ export SETTINGS_DIR=.
    $ docker-compose up -d  # start postgres and redis
-   $ gunicorn tests.service:__hug_wsgi__
    $ pytest tests
 
 6. When you're done making changes for fastapi, check that your changes pass flake8 and the
@@ -92,7 +91,6 @@ Ready to contribute? Here's how to set up `apphelpers` for local development.
 
    $ export SETTINGS_DIR=.
    $ docker-compose up -d  # start postgres and redis
-   $ uvicorn fastapi_tests.service:app --host 0.0.0.0 --port 5000
    $ pytest fastapi_tests
 
 7. Commit your changes and push your branch to GitHub::

apphelpers/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """Scroll Tech"""
 __email__ = "[email protected]"
-__version__ = "0.96.1"
+__version__ = "0.96.2"

apphelpers/db/peewee.py

@@ -41,7 +41,6 @@ def create_pgdb_pool(
         user=user,
         password=password,
         max_connections=max_connections,
-        autorollback=True,
         register_hstore=False,
         stale_timeout=60 * 2,
     )  # 2 minutes
@@ -54,7 +53,12 @@ class Meta:
             only_save_dirty = True
 
         def to_dict(self, only=None, exclude=None, recurse=False):
-            return model_to_dict(self, only=only, exclude=exclude, recurse=recurse)
+            return model_to_dict(
+                self,
+                only=only,
+                exclude=exclude,
+                recurse=recurse,
+            )
 
     return BaseModel
 
@@ -77,8 +81,8 @@ def dbtransaction_ctx(db):
 def dbtransaction(db):
     """
     wrapper that make db transactions automic
-    note db connections are used only when it is needed (hence there is no usual
-    connection open/close)
+    note db connections are used only when it is needed (hence there is no
+    usual connection open/close)
     """
 
     def wrapper(f):
@@ -97,8 +101,8 @@ def enumify(TheModel, name_field="name", val_field="id"):
     Converts a model rows into an enum
     Can be effective cache for mostly unchanging data.
     Limitation: No auto updates. If you update the model and you are using
-    process manager like gunicorn you would need to restart to rnsure enums are
-    updated
+    process manager like gunicorn you would need to restart to rnsure enums
+    are updated
 
     eg.
     >>> class Week(BaseModel):
@@ -130,7 +134,8 @@ def get_sub_models(base_model):
 
 
 # Useful functions for test/dev setups
-# NOTE: For below functions, models is list of model classes sorted by dependency
+# NOTE: For below functions, models is list of model classes sorted by
+# dependency
 # Example: [Author, Publication, Post, Comment]
 
 

apphelpers/db/piccolo.py

@@ -1,17 +1,9 @@
 from contextlib import asynccontextmanager
 from functools import wraps
-from typing import (
-    List,
-    Set,
-    Type,
-)
+from typing import List, Set, Type
 
 from piccolo.engine.postgres import PostgresEngine
-from piccolo.table import (
-    Table,
-    create_db_tables_sync,
-    drop_db_tables_sync,
-)
+from piccolo.table import Table, create_db_tables_sync, drop_db_tables_sync
 
 
 @asynccontextmanager

apphelpers/rest/common.py

@@ -1,15 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import (
-    asdict,
-    dataclass,
-    field,
-)
-from typing import (
-    Dict,
-    List,
-    Optional,
-)
+from dataclasses import asdict, dataclass, field
+from typing import Dict, List, Optional
 
 from converge import settings
 from requests.exceptions import HTTPError

apphelpers/rest/fastapi.py

@@ -3,11 +3,7 @@
 from typing import Annotated
 
 from converge import settings
-from fastapi import (
-    APIRouter,
-    Depends,
-    Header,
-)
+from fastapi import APIRouter, Depends, Header
 from fastapi.routing import APIRoute
 from starlette.requests import Request
 
@@ -20,11 +16,7 @@
     InvalidSessionError,
 )
 from apphelpers.rest import endpoint as ep
-from apphelpers.rest.common import (
-    User,
-    notify_honeybadger,
-    phony,
-)
+from apphelpers.rest.common import User, notify_honeybadger, phony
 from apphelpers.sessions import SessionDBHandler
 
 if settings.get("HONEYBADGER_API_KEY"):

apphelpers/rest/hug.py

@@ -4,11 +4,7 @@
 
 import hug
 from converge import settings
-from falcon import (
-    HTTPForbidden,
-    HTTPNotFound,
-    HTTPUnauthorized,
-)
+from falcon import HTTPForbidden, HTTPNotFound, HTTPUnauthorized
 from hug.decorators import wraps
 
 from apphelpers.db import dbtransaction

apphelpers/utilities/caching.py

@@ -1,12 +1,7 @@
 from __future__ import annotations
 
 import json
-from typing import (
-    Any,
-    ClassVar,
-    List,
-    Optional,
-)
+from typing import Any, ClassVar, List, Optional
 
 from redis import Redis
 

docs/conf.py

@@ -23,7 +23,7 @@
 
 sys.path.insert(0, os.path.abspath(".."))
 
-import apphelpers
+import apphelpers  # noqa E402
 
 # -- General configuration ---------------------------------------------
 

fastapi_tests/app/endpoints.py

@@ -4,13 +4,7 @@
 from pydantic import BaseModel
 
 from apphelpers.rest import endpoint as ep
-from apphelpers.rest.fastapi import (
-    header,
-    json_body,
-    user,
-    user_agent,
-    user_id,
-)
+from apphelpers.rest.fastapi import header, json_body, user, user_agent, user_id
 from fastapi_tests.app.models import Book
 
 

fastapi_tests/service.py

@@ -5,10 +5,10 @@
 
 sys.path.append(os.getcwd() + "/..")
 
-import settings
-from apphelpers.rest.fastapi import APIFactory
-from fastapi_tests.app.endpoints import setup_routes
-from fastapi_tests.app.models import db
+import settings  # noqa E402
+from apphelpers.rest.fastapi import APIFactory  # noqa E402
+from fastapi_tests.app.endpoints import setup_routes  # noqa E402
+from fastapi_tests.app.models import db  # noqa E402
 
 
 def make_app():

requirements_dev.txt

@@ -22,6 +22,7 @@ pre-commit
 fastapi
 httpx
 pytest
+pytz
 uvicorn
 celery
 requests

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.96.1
+current_version = 0.96.2
 commit = True
 tag = True
 
@@ -16,5 +16,10 @@ universal = 1
 
 [flake8]
 exclude = docs
+max-line-length = 88
+
+[isort]
+multi_line_output = 3
+profile = black
 
 [aliases]

setup.py

@@ -42,6 +42,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/scrolltech/apphelpers",
-    version="0.96.1",
+    version="0.96.2",
     zip_safe=False,
 )

tests/test_peewee.py

@@ -1,11 +1,7 @@
 from peewee import TextField
 
 import settings
-from apphelpers.db.peewee import (
-    create_base_model,
-    create_pgdb_pool,
-    dbtransaction,
-)
+from apphelpers.db.peewee import create_base_model, create_pgdb_pool, dbtransaction
 
 db = create_pgdb_pool(
     host=settings.DB_HOST,