wcp-library 1.1.4__tar.gz → 1.1.6__tar.gz

{wcp_library-1.1.4 → wcp_library-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.1.4
+Version: 1.1.6
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.1.4 → wcp_library-1.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.1.4"
+version = "1.1.6"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

{wcp_library-1.1.4 → wcp_library-1.1.6}/wcp_library/__init__.py

@@ -4,11 +4,12 @@ from pathlib import Path
 
 # PyInstaller import
 import pip_system_certs.wrapt_requests
+import cryptography.hazmat.primitives.kdf.pbkdf2
 
 
 # Application Path
 if getattr(sys, 'frozen', False):
-    application_path = sys.executable + '-'
+    application_path = sys.executable
     application_path = Path(application_path).parent
 else:
     application_path = Path(os.environ['VIRTUAL_ENV']).parent

{wcp_library-1.1.4 → wcp_library-1.1.6}/wcp_library/ftp/ftp.py

@@ -44,6 +44,8 @@ class FTP:
         :return:
         """
 
+        local_file.parent.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading {remote_file} to {local_file}")
         self.ftp_connection.download(remote_file, local_file)
 
@@ -56,6 +58,8 @@ class FTP:
         :return:
         """
 
+        local_dir.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading files from FTP server matching {regex_pattern} to {local_dir}")
         files = self.list_files()
         for file in files:

{wcp_library-1.1.4 → wcp_library-1.1.6}/wcp_library/ftp/sftp.py

@@ -48,6 +48,8 @@ class SFTP:
         :return:
         """
 
+        local_file.parent.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading {remote_file} to {local_file}")
         self.sftp_connection.get(str(remote_file), local_file)
 
@@ -60,6 +62,8 @@ class SFTP:
         :return:
         """
 
+        local_dir.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading files from FTP server matching {regex_pattern} to {local_dir}")
         files = self.list_files()
         for file in files:

{wcp_library-1.1.4 → wcp_library-1.1.6}/wcp_library/sql/oracle.py

@@ -33,8 +33,6 @@ def _connect_warehouse(username: str, password: str, hostname: str, port: int, d
         min=min_connections,
         max=max_connections,
         increment=1,
-        threaded=True,
-        encoding="UTF-8"
     )
     return session_pool