dbtk 0.8.1__tar.gz → 0.8.2__tar.gz

{dbtk-0.8.1 → dbtk-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbtk
-Version: 0.8.1
+Version: 0.8.2
 Summary: Data Benders Toolkit - A lightweight toolkit for data integration, ELT and ETL
 Author: Scott Bailey <scottrbailey@gmail.com>
 License: MIT

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk/__init__.py

@@ -36,9 +36,9 @@ from .database import Database
 from .config import connect, set_config_file
 from .cursors import Cursor
 from .logging_utils import setup_logging, cleanup_old_logs, errors_logged
-from . import etl
 from . import readers
 from . import writers
+from . import etl
 
 # Simple, clean exports
 __all__ = [

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk/cli.py

@@ -114,7 +114,8 @@ def checkup():
 
 def main():
     parser = argparse.ArgumentParser(prog='dbtk', description='DBTK command-line utilities')
-    subparsers = parser.add_subparsers(dest='command', required=True)
+    subparsers = parser.add_subparsers(dest='command')
+    subparsers.required = True  # required= kwarg not supported in Python 3.6
 
     # checkup
     subparsers.add_parser('checkup', help='Check for dependencies and configuration issues')

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk/etl/table.py

@@ -63,7 +63,7 @@ class Table:
               'user_id': {'default': lambda: conf_vars['user_id']},
           }
 
-    * **fn** (callable | list[callable] | str, optional):
+    * **fn** (Union[callable, List[callable], str], optional):
       Transformation function(s) to apply to the source value.
       callable: applied directly; list: functions applied in order (pipeline);
       str: magic shorthand (e.g. 'int', 'maxlen:255', 'lookup:table:col:val').

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk/readers/fixed_width.py

@@ -4,7 +4,7 @@
 
 import logging
 import os
-from typing import TextIO, List, Dict, Any, Optional, Iterator
+from typing import TextIO, List, Dict, Any, Optional, Iterator, Type
 
 from .base import Reader
 from ..record import Record, FixedWidthRecord
@@ -271,7 +271,7 @@ class EDIReader(FixedReader):
     def _get_columns(self, type_code: str) -> List[FixedColumn]:
         return self.columns.get(type_code)
 
-    def _get_factory(self, type_code: str) -> type[Record]:
+    def _get_factory(self, type_code: str) -> Type[Record]:
         if type_code not in self._type_factories:
             cols = self._get_columns(type_code)
             if cols is None:

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk/writers/base.py

@@ -181,7 +181,7 @@ class BaseWriter(ABC):
 
         Returns
         -------
-        tuple[Union[TextIO, BinaryIO], bool]
+        Tuple[Union[TextIO, BinaryIO], bool]
             (file_handle, should_close_flag)
         """
         if self.file is None:
@@ -280,7 +280,7 @@ class BaseWriter(ABC):
 
         Returns
         -------
-        tuple[Optional[Iterator], Optional[List[str]]]
+        Tuple[Optional[Iterator], Optional[List[str]]]
             (iterator, column_names)
         """
         if not data:

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk/writers/xml.py

@@ -207,7 +207,7 @@ class XMLStreamer(BatchWriter):
 
         Returns
         -------
-        tuple[BinaryIO, bool]
+        Tuple[BinaryIO, bool]
             (file_handle, should_close_flag)
 
         Raises

{dbtk-0.8.1 → dbtk-0.8.2}/dbtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbtk
-Version: 0.8.1
+Version: 0.8.2
 Summary: Data Benders Toolkit - A lightweight toolkit for data integration, ELT and ETL
 Author: Scott Bailey <scottrbailey@gmail.com>
 License: MIT

{dbtk-0.8.1 → dbtk-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbtk"
-version = "0.8.1"
+version = "0.8.2"
 description = "Data Benders Toolkit - A lightweight toolkit for data integration, ELT and ETL"
 readme = "README.md"
 requires-python = ">=3.6"
@@ -78,5 +78,9 @@ Homepage = "https://github.com/scottrbailey/dbtk"
 Documentation = "https://dbtk.readthedocs.io"
 Repository = "https://github.com/scottrbailey/dbtk.git"
 
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["dbtk*"]
+
 [tool.setuptools.package-data]
 dbtk = ["dbtk_sample.yml"]