From 3893d7cc3d07a5440eb90c97433c6e9977a51019 Mon Sep 17 00:00:00 2001 From: Pawel Konieczny Date: Tue, 4 Mar 2025 19:04:24 +0100 Subject: [PATCH 1/3] Drop psycopg dependency --- requirements.txt | 1 - setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6e7fef6..8c6d715 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ Flask>=2.3.2 Flask-SQLAlchemy>=3.0.5 SQLAlchemy==1.4.50 -psycopg2-binary>=2.8.1 alembic>=1.5.1 six>=1.15.0 python-dateutil diff --git a/setup.py b/setup.py index 4b7d9fa..8b873fd 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,6 @@ "Flask>=2.1.0", "Flask-SQLAlchemy>=2.5.1", "SQLAlchemy>=1.4.0", - "psycopg2>=2.7.1", ], extras_require={"user_info": ["Flask-Login>=0.4.0"]}, include_package_data=True, From 254071b7ce6734bcfe1075f6ef4444b056b4f475 Mon Sep 17 00:00:00 2001 From: Pawel Konieczny Date: Tue, 4 Mar 2025 19:08:00 +0100 Subject: [PATCH 2/3] Bump CI action versions --- .github/workflows/pre-commit.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index b05d16d..6041809 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -9,11 +9,11 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - name: set PY run: echo "PY=$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" >> $GITHUB_ENV - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.cache/pre-commit key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87c0722..76ec4d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,15 +24,15 @@ jobs: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Display Python version run: python -c "import sys; print(sys.version)" - name: Cache virtualenv - uses: actions/cache@v1 + uses: actions/cache@v4 id: cache-pip with: path: venv From 1645a6d63d15a6943ecd64becc2bc84c09a64c88 Mon Sep 17 00:00:00 2001 From: Pawel Konieczny Date: Tue, 4 Mar 2025 19:12:04 +0100 Subject: [PATCH 3/3] Run pre-commit. Add psycopg as test dep only --- chrononaut/__init__.py | 10 +++++----- chrononaut/change_info.py | 4 ++-- chrononaut/exceptions.py | 3 +-- chrononaut/flask_versioning.py | 5 ++++- requirements.txt | 2 ++ tests/test_basic.py | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/chrononaut/__init__.py b/chrononaut/__init__.py index fb31b25..51b8ebe 100644 --- a/chrononaut/__init__.py +++ b/chrononaut/__init__.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """ - chrononaut - ~~~~~~~~~~~~~~~~~~~ - A history mixin for audit logging, record locking, and time travel with Flask-SQLAlchemy - :copyright: (c) 2017 by Reference Genomics, Inc. - :license: MIT, see LICENSE for more details. +chrononaut +~~~~~~~~~~~~~~~~~~~ +A history mixin for audit logging, record locking, and time travel with Flask-SQLAlchemy +:copyright: (c) 2017 by Reference Genomics, Inc. +:license: MIT, see LICENSE for more details. """ from sqlalchemy import event diff --git a/chrononaut/change_info.py b/chrononaut/change_info.py index 3ab37f4..c9dc6c6 100644 --- a/chrononaut/change_info.py +++ b/chrononaut/change_info.py @@ -1,5 +1,5 @@ -"""Change info mixins. Require Flask for getting request and app context variables. -""" +"""Change info mixins. Require Flask for getting request and app context variables.""" + from datetime import datetime from flask import current_app, g, request, has_request_context, has_app_context diff --git a/chrononaut/exceptions.py b/chrononaut/exceptions.py index 5101cff..aae9c08 100644 --- a/chrononaut/exceptions.py +++ b/chrononaut/exceptions.py @@ -1,5 +1,4 @@ -"""Custom Exceptions raised by History Models -""" +"""Custom Exceptions raised by History Models""" class ChrononautException(Exception): diff --git a/chrononaut/flask_versioning.py b/chrononaut/flask_versioning.py index f460710..77fdab4 100644 --- a/chrononaut/flask_versioning.py +++ b/chrononaut/flask_versioning.py @@ -1,5 +1,8 @@ -"""Flask versioning extension. Requires g and _app_ctx_stack in looking for extra recorded changes. """ +Flask versioning extension. +Requires g and _app_ctx_stack in looking for extra recorded changes. +""" + from flask import g, current_app, has_app_context from datetime import datetime from dateutil.tz import tzutc diff --git a/requirements.txt b/requirements.txt index 8c6d715..aaad902 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,3 +19,5 @@ enum34>=1.1.10 flake8 black==23.7.0 sqlalchemy-utils +psycopg2-binary +setuptools diff --git a/tests/test_basic.py b/tests/test_basic.py index 8a6ad09..56dca0e 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -1,5 +1,5 @@ -"""Test basic FlaskSQLAlchemy integration points -""" +"""Test basic FlaskSQLAlchemy integration points""" + import sqlalchemy import chrononaut