hdx-python-database 1.3.3__tar.gz → 1.3.5__tar.gz

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/.config/pre-commit-config.yaml

@@ -2,13 +2,13 @@ default_language_version:
     python: python3.12
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.9.6
     hooks:
       # Run the linter.
       - id: ruff
@@ -17,7 +17,7 @@ repos:
       - id: ruff-format
         args: [--config, .config/ruff.toml]
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.2.33
+    rev: 0.5.29
     hooks:
       # Run the pip compile
       - id: pip-compile

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hdx-python-database
-Version: 1.3.3
+Version: 1.3.5
 Summary: HDX Python database utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-database
 Author-email: Michael Rans <rans@email.com>

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/pyproject.toml

@@ -85,9 +85,12 @@ python = ["3.12"]
 run = """
        pytest -c .config/pytest.ini --rootdir=. --junitxml=test-results.xml \
        --cov --cov-config=.config/coveragerc --no-cov-on-fail \
-       --cov-report=lcov --cov-report=term-missing -p no:randomly
+       --cov-report=lcov --cov-report=term-missing
        """
 
+[tool.hatch.envs.hatch-static-analysis]
+dependencies = ["ruff==0.9.6"]
+
 [tool.hatch.envs.hatch-static-analysis.scripts]
 format-check = ["ruff format --config .config/ruff.toml --check --diff {args:.}",]
 format-fix = ["ruff format --config .config/ruff.toml {args:.}",]

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/requirements.txt

@@ -1,56 +1,56 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
-bcrypt==4.2.0
+bcrypt==4.2.1
     # via paramiko
-cffi==1.17.0
+cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
 cfgv==3.4.0
     # via pre-commit
-coverage==7.6.1
+coverage==7.6.11
     # via pytest-cov
-cryptography==43.0.0
+cryptography==44.0.0
     # via paramiko
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
-filelock==3.15.4
+filelock==3.17.0
     # via virtualenv
-greenlet==3.0.3
+greenlet==3.1.1
     # via sqlalchemy
-identify==2.6.0
+identify==2.6.7
     # via pre-commit
 iniconfig==2.0.0
     # via pytest
 nodeenv==1.9.1
     # via pre-commit
-packaging==24.1
+packaging==24.2
     # via pytest
-paramiko==3.4.0
+paramiko==3.5.1
     # via sshtunnel
-platformdirs==4.2.2
+platformdirs==4.3.6
     # via virtualenv
 pluggy==1.5.0
     # via pytest
-pre-commit==3.8.0
+pre-commit==4.1.0
     # via hdx-python-database (pyproject.toml)
-psycopg==3.2.1
+psycopg==3.2.4
     # via hdx-python-database (pyproject.toml)
-psycopg-binary==3.2.1
+psycopg-binary==3.2.4
     # via psycopg
 pycparser==2.22
     # via cffi
 pynacl==1.5.0
     # via paramiko
-pytest==8.3.2
+pytest==8.3.4
     # via
     #   hdx-python-database (pyproject.toml)
     #   pytest-cov
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via hdx-python-database (pyproject.toml)
 pyyaml==6.0.2
     # via pre-commit
-sqlalchemy==2.0.32
+sqlalchemy==2.0.38
     # via hdx-python-database (pyproject.toml)
 sshtunnel==0.4.0
     # via hdx-python-database (pyproject.toml)
@@ -58,5 +58,5 @@ typing-extensions==4.12.2
     # via
     #   psycopg
     #   sqlalchemy
-virtualenv==20.26.3
+virtualenv==20.29.1
     # via pre-commit

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/src/hdx/database/__init__.py

@@ -258,7 +258,9 @@ class Database:
             engine = create_engine(db_uri, poolclass=NullPool, echo=False)
         if reflect:
             Base = automap_base(declarative_base=table_base)
-            Base.prepare(autoload_with=engine)
+            Base.prepare(
+                autoload_with=engine, reflection_options={"views": True}
+            )
             table_base = Base
         else:
             table_base.metadata.create_all(engine)

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/src/hdx/database/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.3'
-__version_tuple__ = version_tuple = (1, 3, 3)
+__version__ = version = '1.3.5'
+__version_tuple__ = version_tuple = (1, 3, 5)

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/src/hdx/database/postgresql.py

@@ -87,7 +87,7 @@ def restore_from_pgfile(db_uri: str, pg_restore_file: str) -> str:
     except subprocess.CalledProcessError as ex:
         command = " ".join(subprocess_params)
         raise PostgresError(
-            f"{command} failed. Return code: {process.returncode}"
+            f"{command} failed. Return code: {process.returncode}. Error: {process.stderr}"
         ) from ex
 
     for line in process.stdout.splitlines():

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/src/hdx/database/views.py

@@ -7,10 +7,8 @@ https://github.com/sqlalchemy/sqlalchemy/wiki/Views#sqlalchemy-14-20-version
 """
 
 import sqlalchemy as sa
-from sqlalchemy import MetaData, Selectable, TableClause
 from sqlalchemy.ext import compiler
 from sqlalchemy.schema import DDLElement
-from sqlalchemy.sql import table
 
 
 class CreateView(DDLElement):
@@ -45,22 +43,15 @@ def view_doesnt_exist(ddl, target, connection, **kw):
     return not view_exists(ddl, target, connection, **kw)
 
 
-def view(name: str, metadata: MetaData, selectable: Selectable) -> TableClause:
-    """Prepare SQLAlchemy view. Must be run before Base.metadata.create_all.
-
-    Args:
-        name (str): View name
-        metadata (MetaData): Base metadata
-        selectable (Selectable): SQLAlchemy select statement
-
-    Returns:
-        TableClause: SQLAlchemy View
-    """
-    t = table(name)
-
-    t._columns._populate_separate_keys(
-        col._make_proxy(t) for col in selectable.selected_columns
+def view(name, metadata, selectable):
+    t = sa.table(
+        name,
+        *(
+            sa.Column(c.name, c.type, primary_key=c.primary_key)
+            for c in selectable.selected_columns
+        ),
     )
+    t.primary_key.update(c for c in t.c if c.primary_key)
 
     sa.event.listen(
         metadata,

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/tests/hdx/database/test_database.py

@@ -2,7 +2,8 @@
 
 from datetime import datetime, timezone
 from os import remove
-from os.path import join
+from os.path import exists, join
+from tempfile import gettempdir
 
 import pytest
 from sqlalchemy import select
@@ -13,30 +14,23 @@ from hdx.database.no_timezone import Base as NoTZBase
 
 
 class TestDatabase:
-    dbpath = join("tests", "test_database.db")
-
-    @pytest.fixture(scope="function")
-    def nodatabase(self):
-        try:
-            remove(TestDatabase.dbpath)
-        except OSError:
-            pass
-        return f"sqlite:///{TestDatabase.dbpath}"
-
-    def test_get_session(self, nodatabase):
+    def test_get_session(self):
         assert DBTestDate.__tablename__ == "db_test_date"
 
         def prepare_fn():
             return Database.prepare_views([date_view_params])
 
+        dbpath = join(gettempdir(), "test_database.db")
+        if exists(dbpath):
+            remove(dbpath)
         with Database(
-            database=TestDatabase.dbpath,
+            database=dbpath,
             port=None,
             dialect="sqlite",
             prepare_fn=prepare_fn,
         ) as dbdatabase:
             dbsession = dbdatabase.get_session()
-            assert str(dbsession.bind.engine.url) == nodatabase
+            assert str(dbsession.bind.engine.url) == f"sqlite:///{dbpath}"
             assert dbdatabase.base == NoTZBase
             now = datetime(2022, 10, 20, 22, 35, 55, tzinfo=timezone.utc)
             input_dbtestdate = DBTestDate()
@@ -48,6 +42,7 @@ class TestDatabase:
             date_view = dbdatabase.get_prepare_results()[0]
             dbtestdate = dbsession.execute(select(date_view)).scalar_one()
             assert dbtestdate == now
+        remove(dbpath)
 
     def test_errors(self):
         with pytest.raises(DatabaseError):

{hdx_python_database-1.3.3 → hdx_python_database-1.3.5}/tests/hdx/database/test_reflect.py

@@ -4,8 +4,8 @@ from datetime import datetime
 from os import remove
 from os.path import join
 from shutil import copyfile
+from tempfile import gettempdir
 
-import pytest
 from sqlalchemy import select
 from sqlalchemy.orm.decl_api import DeclarativeAttributeIntercept
 
@@ -13,30 +13,22 @@ from hdx.database import Database
 
 
 class TestReflect:
-    dbpath = join("tests", "test_database.db")
-    testdb = join("tests", "fixtures", "test.db")
-
-    @pytest.fixture(scope="function")
-    def database_to_reflect(self):
-        try:
-            remove(TestReflect.dbpath)
-            copyfile(TestReflect.testdb, TestReflect.dbpath)
-        except OSError:
-            pass
-        return f"sqlite:///{TestReflect.dbpath}"
-
-    def test_get_reflect_session(self, database_to_reflect):
+    def test_get_reflect_session(self):
+        dbpath = join(gettempdir(), "test_reflect.db")
+        testdb = join("tests", "fixtures", "test.db")
+        copyfile(testdb, dbpath)
         with Database(
-            database=TestReflect.dbpath,
+            database=dbpath,
             port=None,
             dialect="sqlite",
             reflect=True,
         ) as dbdatabase:
             dbengine = dbdatabase.get_engine()
-            assert str(dbengine.url) == "sqlite:///tests/test_database.db"
+            dburi = f"sqlite:///{dbpath}"
+            assert str(dbengine.url) == dburi
             dbsession = dbdatabase.get_session()
             assert isinstance(dbdatabase.base, DeclarativeAttributeIntercept)
-            assert str(dbsession.bind.engine.url) == database_to_reflect
+            assert str(dbsession.bind.engine.url) == dburi
             Table1 = dbdatabase.get_reflected_classes().table1
             row = dbsession.execute(select(Table1)).scalar_one()
             assert row.id == "1"
@@ -44,3 +36,4 @@ class TestReflect:
             # with reflection, type annotation maps do not work and hence
             # we don't have a timezone here
             assert row.date1 == datetime(1993, 9, 23, 14, 12, 56, 111000)
+        remove(dbpath)