Allow xlsx_to_tsv function to work on python3.7+

nrccua · Nov 2, 2022 · 8c46858 · 8c46858
1 parent 7e5f0ba
commit 8c46858
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,20 @@ History
 =======
 
 
+v0.17.20 (2022-11-02)
+
+* Allow xlsx_to_tsv function to work on python3.7+ by removing python3.10 specific typing using |.
+* Add openpyxl as a required dependency for aioradio.
+* Update aiojobs==1.1.0.
+* Update backoff==2.2.1.
+* Update dominodatalab==1.2.0.
+* Update orjson==3.8.1.
+* Update pylint==2.15.5.
+* Update pytest==7.2.0.
+* Update pytest-asyncio==0.20.1.
+* Update pytest-cov==4.0.0.
+
+
 v0.17.19 (2022-10-28)
 
 * Update xlsx_to_tsv function to use s3 instead of local directories for origin/destination files.

diff --git a/aioradio/file_ingestion.py b/aioradio/file_ingestion.py
@@ -30,7 +30,7 @@
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 from types import coroutine
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Union
 
 import mandrill
 import numpy as np
@@ -1628,7 +1628,7 @@ async def xlsx_to_tsv(
     s3_destination_bucket: str,
     s3_destination_key: str,
     delimiter: str='\t'
-) -> str | None:
+) -> Union[str, None]:
     """Convert and xlsx file to csv/tsv file.
 
     Args:
@@ -1639,7 +1639,7 @@ async def xlsx_to_tsv(
         delimiter (str, optional): Delimiter. Defaults to '\t'.
 
     Returns:
-        str | None: Error message during process else None
+        Union[str, None]: Error message during process else None
     """
 
     try:

diff --git a/aioradio/requirements.txt b/aioradio/requirements.txt
@@ -1,27 +1,28 @@
 aioboto3==10.1.0
 aiobotocore==2.4.0
-aiojobs==1.0.0
-backoff==2.1.2
+aiojobs==1.1.0
+backoff==2.2.1
 boto3==1.24.59
 botocore==1.27.59
 ddtrace==1.3.6
-dominodatalab==1.1.1
+dominodatalab==1.2.0
 fakeredis==1.9.4
 flask==2.1.2
 flask-cors==3.0.10
 httpx==0.23.0
 mandrill==1.0.60
 moto==3.1.18
-orjson==3.8.0
+openpyxl==3.0.10
+orjson==3.8.1
 pandas==1.4.4
 pre-commit==2.20.0
 psycopg2-binary==2.9.3
-pylint==2.15.4
+pylint==2.15.5
 pyodbc==4.0.34
 pysmb==1.2.8
-pytest==7.1.3
-pytest-asyncio==0.19.0
-pytest-cov==3.0.0
+pytest==7.2.0
+pytest-asyncio==0.20.1
+pytest-cov==4.0.0
 python-json-logger==2.0.4
 redis==3.5.3
 twine==4.0.1

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     long_description = fileobj.read()
 
 setup(name='aioradio',
-    version='0.17.19',
+    version='0.17.20',
     description='Generic asynchronous i/o python utilities for AWS services (SQS, S3, DynamoDB, Secrets Manager), Redis, MSSQL (pyodbc), JIRA and more',
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -27,11 +27,12 @@
         'botocore==1.27.59',
         'boto3==1.24.59',
         'ddtrace>=0.60.1',
-        'dominodatalab==1.1.1',
+        'dominodatalab>=1.1.1',
         'fakeredis>=1.7.1',
         'httpx>=0.23.0',
         'mandrill>=1.0.60',
         'numpy>=1.19',
+        'openpyxl>=3.0.10',
         'orjson>=3.6.8',
         'pandas>=1.3.5',
         'psycopg2-binary==2.9.3',