Merge branch 'main' into tooling_updates

Author: bmos

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+## What is this change?
+- (List out the changes.)
+- (Link to any relevant Github issues or Slack discussion)
+
+## Considerations for discussion
+- (List out any significant design decisions that were made and why.)
+
+## How to test the changes (if needed)
+- (How should a reviewer test this functionality)

parsons/etl/etl.py

@@ -207,7 +207,7 @@ def convert_column(self, *column, **kwargs):
         """
         Transform values under one or more fields via arbitrary functions, method
         invocations or dictionary translations. This leverages the petl ``convert()``
-        method. Example usage can be found `here <https://petl.readthedocs.io/en/v0.24/transform.html#petl.convert>`_.
+        method. Example usage can be found `here <https://petl.readthedocs.io/latest/transform.html#petl.transform.conversions.convert>`_.
 
         `Args:`
             *column: str

parsons/newmode/newmode.py

@@ -427,11 +427,11 @@ def converted_request(
             client=client,
             override_api_version=override_api_version,
         )
-
-        if convert_to_table:
-            return client.convert_to_table(data=response)
-        else:
-            return response
+        if response:
+            if convert_to_table:
+                return client.convert_to_table(data=response)
+            else:
+                return response
 
     def get_campaign(self, campaign_id, params={}):
         """

parsons/redash/redash.py

@@ -45,8 +45,8 @@ def __init__(
     ):
         self.base_url = check("REDASH_BASE_URL", base_url)
         self.user_api_key = check("REDASH_USER_API_KEY", user_api_key, optional=True)
-        self.pause = int(check("REDASH_PAUSE_TIME", pause_time, optional=True))
-        self.timeout = int(check("REDASH_TIMEOUT", timeout, optional=True))
+        self.pause = int(check("REDASH_PAUSE_TIME", str(pause_time), optional=True))
+        self.timeout = int(check("REDASH_TIMEOUT", str(timeout), optional=True))
 
         self.verify = verify  # for https requests
         self.session = requests.Session()

parsons/utilities/check_env.py

@@ -1,19 +1,20 @@
 import os
-from typing import NoReturn, Optional, Union
+from typing import Optional
 
 
-def check(env: str, field: Optional[str], optional: Optional[bool] = False) -> Union[str, NoReturn]:
+def check(env: str, field: Optional[str], optional: Optional[bool] = False) -> Optional[str]:
     """
     Check if an environment variable has been set. If it has not been set
     and the passed field or arguments have not been passed, then raise an
     error.
     """
-    if not field:
-        try:
-            return os.environ[env]
-        except KeyError:
-            if not optional:
-                raise KeyError(
-                    f"No {env} found. Store as environment variable or pass as an argument."
-                )
-    return field
+    if field:
+        return field
+    try:
+        return os.environ[env]
+    except KeyError as e:
+        if not optional:
+            raise KeyError(
+                f"No {env} found. Store as environment variable or pass as an argument."
+            ) from e
+        return None