Replace cchardet with faust-cchardet

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 default_language_version:
-    python: python3.10
+    python: python3.11
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
@@ -14,11 +14,7 @@ repos:
     -   id: name-tests-test
     -   id: requirements-txt-fixer
     -   id: trailing-whitespace
--   repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-    -   id: isort
 -   repo: https://github.com/myint/docformatter
-    rev: v1.5.1
+    rev: v1.7.5
     hooks:
     -   id: docformatter

HISTORY.rst

@@ -3,6 +3,12 @@ History
 =======
 
 
+v0.18.4 (2023-07-21)
+
+* Replace cchardet with faust-cchardet.
+* Update cython==0.29.36.
+* Update dominodatalab==1.2.4.
+
 v0.18.3 (2023-06-07)
 
 * Add excel sheet filter to file ingestion efi functions.

Makefile

@@ -6,7 +6,6 @@ clean:
 
 install:
 	. env/bin/activate; \
-	pip install cython==0.29.35; \
 	pip install -r aioradio/requirements.txt
 
 setup:

aioradio/aws/moto_server.py

@@ -1,4 +1,4 @@
-"""moto server for pytesting aws services."""
+"""Moto server for pytesting aws services."""
 
 # pylint: disable=broad-exception-raised
 # pylint: disable=too-many-instance-attributes

aioradio/aws/utils.py

@@ -1,4 +1,3 @@
-
 """Generic async utility functions."""
 
 # pylint: disable=broad-except

aioradio/logger.py

@@ -15,7 +15,7 @@ class CustomJsonFormatter(jsonlogger.JsonFormatter):
     """Custom Json Formatter."""
 
     def add_fields(self, log_record: Dict[str, Any], record: logging.LogRecord, message_dict: Dict[str, Any]):
-        """normalize default set of fields.
+        """Normalize default set of fields.
 
         Args:
             log_record (Dict[str, Any]): dict object containing log record info

aioradio/redis.py

@@ -1,4 +1,4 @@
-"""aioradio redis cache script."""
+"""Aioradio redis cache script."""
 
 # pylint: disable=c-extension-no-member
 # pylint: disable=no-member
@@ -30,7 +30,7 @@
 
 @dataclass
 class Redis:
-    """class dealing with redis functions."""
+    """Class dealing with redis functions."""
 
     config: Dict[str, Any] = dataclass_field(default_factory=dict)
     pool: redis.Redis = dataclass_field(init=False, repr=False)
@@ -411,7 +411,7 @@ async def hexists(self, key: str, field: str) -> bool:
         return self.pool.hexists(key, field)
 
     async def build_cache_key(self, payload: Dict[str, Any], separator='|', use_hashkey: bool=None) -> str:
-        """build a cache key from a dictionary object. Concatenate and
+        """Build a cache key from a dictionary object. Concatenate and
         normalize key-values from an unnested dict, taking care of sorting the
         keys and each of their values (if a list).
 

aioradio/requirements.txt

@@ -3,26 +3,27 @@ aiojobs==1.1.0
 backoff==2.2.1
 boto3==1.24.59
 botocore==1.27.59
-cchardet==2.1.7
+cython==0.29.36
 ddtrace==1.11.2
-dominodatalab==1.2.3
+dominodatalab==1.2.4
 fakeredis==1.10.1
+faust-cchardet==2.1.18
 flask==2.1.2
 flask-cors==3.0.10
 httpx==0.24.0
 mandrill==1.0.60
 moto==3.1.18
 openpyxl==3.0.10
 orjson==3.8.10
-pandas==2.0.0
-pre-commit==3.2.2
+pandas==2.0.3
+pre-commit==3.3.3
 psycopg2-binary==2.9.6
-pylint==2.17.2
-pyodbc==4.0.39
+pylint==2.17.4
+pyodbc==4.0.39 --no-binary=pyodbc
 pysmb==1.2.9.1
-pytest==7.3.1
-pytest-asyncio==0.21.0
-pytest-cov==4.0.0
+pytest==7.4.0
+pytest-asyncio==0.21.1
+pytest-cov==4.1.0
 python-json-logger==2.0.7
 redis==3.5.3
 twine==4.0.2

aioradio/tests/aws_secrets_test.py

@@ -1,4 +1,4 @@
-"""pytest secrets."""
+"""Pytest secrets."""
 
 # pylint: disable=unused-argument
 

aioradio/tests/dynamodb_test.py

@@ -1,4 +1,4 @@
-"""pytest dynamodb."""
+"""Pytest dynamodb."""
 
 from decimal import Decimal
 from random import randint

aioradio/tests/file_ingestion_test.py

@@ -1,4 +1,4 @@
-"""pytest file_ingestion script."""
+"""Pytest file_ingestion script."""
 
 # pylint: disable=broad-except
 # pylint: disable=c-extension-no-member

aioradio/tests/jira_test.py

@@ -1,4 +1,4 @@
-"""pytest Jira."""
+"""Pytest Jira."""
 
 # pylint: disable=c-extension-no-member
 

aioradio/tests/logger_test.py

@@ -1,4 +1,4 @@
-"""pytest logger."""
+"""Pytest logger."""
 
 import logging
 

aioradio/tests/long_running_jobs_test.py

@@ -1,4 +1,4 @@
-"""pytest Long Running Jobs."""
+"""Pytest Long Running Jobs."""
 
 from asyncio import create_task, sleep
 from random import randint

aioradio/tests/psycopg2_test.py

@@ -1,4 +1,4 @@
-"""pytest psycopg2 script."""
+"""Pytest psycopg2 script."""
 
 import pytest
 

aioradio/tests/pyodbc_test.py

@@ -1,4 +1,4 @@
-"""pytest pyodbc script."""
+"""Pytest pyodbc script."""
 
 import pytest
 

aioradio/tests/redis_test.py

@@ -1,4 +1,4 @@
-"""pytest redis cache."""
+"""Pytest redis cache."""
 
 # pylint: disable=c-extension-no-member
 

aioradio/tests/s3_test.py

@@ -1,4 +1,4 @@
-"""pytest s3."""
+"""Pytest s3."""
 
 # pylint: disable=logging-fstring-interpolation
 

aioradio/tests/sqs_test.py

@@ -1,4 +1,4 @@
-"""pytest sqs."""
+"""Pytest sqs."""
 
 # pylint: disable=c-extension-no-member
 # pylint: disable=no-member

aioradio/utils.py

@@ -1,4 +1,4 @@
-"""aioradio utils cache script."""
+"""Aioradio utils cache script."""
 
 # pylint: disable=ungrouped-imports
 # pylint: disable=wrong-import-position

conftest.py

@@ -1,4 +1,4 @@
-"""pytest configuration."""
+"""Pytest configuration."""
 
 import asyncio
 import os

setup.py

@@ -7,7 +7,7 @@
     long_description = fileobj.read()
 
 setup(name='aioradio',
-    version='0.18.3',
+    version='0.18.4',
     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",
@@ -26,9 +26,9 @@
         'backoff>=2.1.2',
         'botocore==1.27.59',
         'boto3==1.24.59',
-        #'cchardet>=2.1.7',
+        'faust-cchardet>=2.1.18',
         'ddtrace>=0.60.1',
-        'dominodatalab>=1.1.1',
+        'dominodatalab>=1.2.3',
         'fakeredis>=1.7.1',
         'httpx>=0.23.0',
         'mandrill>=1.0.60',