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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hdx-python-database
-Version: 1.3.2
+Version: 1.3.3
 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.2 → hdx_python_database-1.3.3}/src/hdx/database/__init__.py

@@ -173,7 +173,11 @@ class Database:
             self.reflected_classes = None
 
     def cleanup(self) -> None:
-        self.base.metadata.clear()
+        """Cleanup SQLAlchemy.
+
+        Returns:
+            sqlalchemy.Engine: SQLAlchemy engine
+        """
         self.session.close()
         self.engine.dispose()
         if self.server is not None:
@@ -185,7 +189,12 @@ class Database:
     def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
         self.cleanup()
 
-    def drop_all(self):
+    def drop_all(self) -> None:
+        """Drop all tables.
+
+        Returns:
+            None
+        """
         self.base.metadata.drop_all(self.engine)
 
     def get_engine(self) -> Engine:

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

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

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

@@ -48,7 +48,6 @@ class TestDatabase:
             date_view = dbdatabase.get_prepare_results()[0]
             dbtestdate = dbsession.execute(select(date_view)).scalar_one()
             assert dbtestdate == now
-            dbdatabase.drop_all()
 
     def test_errors(self):
         with pytest.raises(DatabaseError):

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

@@ -44,4 +44,3 @@ 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)
-            dbdatabase.drop_all()

{hdx_python_database-1.3.2 → hdx_python_database-1.3.3}/tests/hdx/database/test_ssh.py

@@ -34,10 +34,6 @@ class TestSSH:
                 == "postgresql+psycopg://myuser@0.0.0.0:12345/mydatabase"
             )
             assert dbdatabase.base == TZBase
-            try:
-                dbdatabase.drop_all()
-            except AttributeError:
-                pass
 
         with Database(
             ssh_host="mysshhost", ssh_port=25, table_base=TZBase, **params
@@ -48,10 +44,6 @@ class TestSSH:
                 == "postgresql+psycopg://myuser@0.0.0.0:12345/mydatabase"
             )
             assert dbdatabase.base == TZBase
-            try:
-                dbdatabase.drop_all()
-            except AttributeError:
-                pass
 
         with Database(ssh_host="mysshhost", **self.params_pg) as dbdatabase:
             dbsession = dbdatabase.get_session()
@@ -60,10 +52,6 @@ class TestSSH:
                 == "postgresql+psycopg://myuser:***@0.0.0.0:12345/mydatabase"
             )
             assert dbdatabase.base == NoTZBase
-            try:
-                dbdatabase.drop_all()
-            except AttributeError:
-                pass
 
         with Database(
             ssh_host="mysshhost", ssh_port=25, **params
@@ -74,7 +62,3 @@ class TestSSH:
                 == "postgresql+psycopg://myuser@0.0.0.0:12345/mydatabase"
             )
             assert dbdatabase.base == NoTZBase
-            try:
-                dbdatabase.drop_all()
-            except AttributeError:
-                pass