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

{hdx_python_database-1.3.4 → 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.6.9
+    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.4.18
+    rev: 0.5.29
     hooks:
       # Run the pip compile
       - id: pip-compile

{hdx_python_database-1.3.4 → 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.4
+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.4 → hdx_python_database-1.3.5}/pyproject.toml

@@ -88,6 +88,9 @@ run = """
        --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.4 → hdx_python_database-1.3.5}/requirements.txt

@@ -1,6 +1,6 @@
 # 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.1
     # via
@@ -8,49 +8,49 @@ cffi==1.17.1
     #   pynacl
 cfgv==3.4.0
     # via pre-commit
-coverage==7.6.3
+coverage==7.6.11
     # via pytest-cov
-cryptography==43.0.1
+cryptography==44.0.0
     # via paramiko
 distlib==0.3.9
     # via virtualenv
-filelock==3.16.1
+filelock==3.17.0
     # via virtualenv
 greenlet==3.1.1
     # via sqlalchemy
-identify==2.6.1
+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.5.0
+paramiko==3.5.1
     # via sshtunnel
 platformdirs==4.3.6
     # via virtualenv
 pluggy==1.5.0
     # via pytest
-pre-commit==4.0.1
+pre-commit==4.1.0
     # via hdx-python-database (pyproject.toml)
-psycopg==3.2.3
+psycopg==3.2.4
     # via hdx-python-database (pyproject.toml)
-psycopg-binary==3.2.3
+psycopg-binary==3.2.4
     # via psycopg
 pycparser==2.22
     # via cffi
 pynacl==1.5.0
     # via paramiko
-pytest==8.3.3
+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.35
+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.6
+virtualenv==20.29.1
     # via pre-commit

{hdx_python_database-1.3.4 → 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.4'
-__version_tuple__ = version_tuple = (1, 3, 4)
+__version__ = version = '1.3.5'
+__version_tuple__ = version_tuple = (1, 3, 5)

{hdx_python_database-1.3.4 → 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,