diff --git a/app/dao/date_util.py b/app/dao/date_util.py index a9b8e3561..8bacdcb0c 100644 --- a/app/dao/date_util.py +++ b/app/dao/date_util.py @@ -60,7 +60,7 @@ def get_current_calendar_year_start_year(): def get_calendar_year_for_datetime(start_date): - if type(start_date) == date: + if isinstance(start_date) == date: start_date = datetime.combine(start_date, time.min) year = int(start_date.strftime("%Y")) diff --git a/poetry.lock b/poetry.lock index 066704cd6..20c9dd042 100644 --- a/poetry.lock +++ b/poetry.lock @@ -211,22 +211,22 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte [[package]] name = "awscli" -version = "1.29.15" +version = "1.29.74" description = "Universal Command Line Environment for AWS." optional = false python-versions = ">= 3.7" files = [ - {file = "awscli-1.29.15-py3-none-any.whl", hash = "sha256:87747ef7af86d3c929510fcc5e22559662b77b81891af9efc4a5d5ff4b0fd9f3"}, - {file = "awscli-1.29.15.tar.gz", hash = "sha256:d2ce17d09886340aedcde9cbbf58f23a237b255adb62f89d7dae68a09f7a238e"}, + {file = "awscli-1.29.74-py3-none-any.whl", hash = "sha256:ad9b1d5da39aab6c048f7114127b29a0c84416a32b2510c1e7fa106ed6912a8e"}, + {file = "awscli-1.29.74.tar.gz", hash = "sha256:dfb25caebf0356639fd42772b7562377201feb2619380ab58d24938f47b1d24d"}, ] [package.dependencies] -botocore = "1.31.15" +botocore = "1.31.74" colorama = ">=0.2.5,<0.4.5" docutils = ">=0.10,<0.17" PyYAML = ">=3.10,<6.1" rsa = ">=3.1.2,<4.8" -s3transfer = ">=0.6.0,<0.7.0" +s3transfer = ">=0.7.0,<0.8.0" [[package]] name = "bandit" @@ -391,38 +391,41 @@ files = [ [[package]] name = "boto3" -version = "1.28.15" +version = "1.28.74" description = "The AWS SDK for Python" optional = false python-versions = ">= 3.7" files = [ - {file = "boto3-1.28.15-py3-none-any.whl", hash = "sha256:84b7952858e9319968b0348d9894a91a6bb5f31e81a45c68044d040a12362abe"}, - {file = "boto3-1.28.15.tar.gz", hash = "sha256:a6e711e0b6960c3a5b789bd30c5a18eea7263f2a59fc07f85efa5e04804e49d2"}, + {file = "boto3-1.28.74-py3-none-any.whl", hash = "sha256:a12619d23d50523bdfa6bd2d0c124a9567a5434ec63e47df71c3e88fc9d482f6"}, + {file = "boto3-1.28.74.tar.gz", hash = "sha256:c4d89ff98cf53e1e74ed8c1c1bb13a7bd7d909e1c0d9ad25792ccfe2cb1575bc"}, ] [package.dependencies] -botocore = ">=1.31.15,<1.32.0" +botocore = ">=1.31.74,<1.32.0" jmespath = ">=0.7.1,<2.0.0" -s3transfer = ">=0.6.0,<0.7.0" +s3transfer = ">=0.7.0,<0.8.0" [package.extras] crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.31.15" +version = "1.31.74" description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">= 3.7" files = [ - {file = "botocore-1.31.15-py3-none-any.whl", hash = "sha256:b3a0f787f275711875476cbe12a0123b2e6570b2f505e2fa509dcec3c5410b57"}, - {file = "botocore-1.31.15.tar.gz", hash = "sha256:b46d1ce4e0cf42d28fdf61ce0c999904645d38b51cb809817a361c0cec16d487"}, + {file = "botocore-1.31.74-py3-none-any.whl", hash = "sha256:3eef070a8d8c4240aad07e5c89395002b140af213bcfc4dcd1d441e3ee4b3bee"}, + {file = "botocore-1.31.74.tar.gz", hash = "sha256:2549ca7dc0f9227d8692a56a133c1346642efb38736c7c3f1330724d937ad6ec"}, ] [package.dependencies] jmespath = ">=0.7.1,<2.0.0" python-dateutil = ">=2.1,<3.0.0" -urllib3 = ">=1.25.4,<1.27" +urllib3 = [ + {version = ">=1.25.4,<1.27", markers = "python_version < \"3.10\""}, + {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""}, +] [package.extras] crt = ["awscrt (==0.16.26)"] @@ -3541,13 +3544,13 @@ pyasn1 = ">=0.1.3" [[package]] name = "s3transfer" -version = "0.6.2" +version = "0.7.0" description = "An Amazon S3 Transfer Manager" optional = false python-versions = ">= 3.7" files = [ - {file = "s3transfer-0.6.2-py3-none-any.whl", hash = "sha256:b014be3a8a2aab98cfe1abc7229cc5a9a0cf05eb9c1f2b86b230fd8df3f78084"}, - {file = "s3transfer-0.6.2.tar.gz", hash = "sha256:cab66d3380cca3e70939ef2255d01cd8aece6a4907a9528740f668c4b0611861"}, + {file = "s3transfer-0.7.0-py3-none-any.whl", hash = "sha256:10d6923c6359175f264811ef4bf6161a3156ce8e350e705396a7557d6293c33a"}, + {file = "s3transfer-0.7.0.tar.gz", hash = "sha256:fd3889a66f5fe17299fe75b82eae6cf722554edca744ca5d5fe308b104883d2e"}, ] [package.dependencies] @@ -4268,4 +4271,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "7a061dfe30fbcbb363823ae6fc5d956f487a6abab85ba3d2008e4e7bdf6647a2" +content-hash = "3a9174f44eaffc65224e48815e2d8961f25a34f228fec9d663c3c75c0ddf24ab" diff --git a/pyproject.toml b/pyproject.toml index 824a9dab5..f8b0bba22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,14 +14,14 @@ arrow = "==1.2.3" asn1crypto = "==1.5.1" async-timeout = "==4.0.3" attrs = "==23.1.0" -awscli = "==1.29.15" +awscli = "^1.29.74" bcrypt = "==3.2.2" beautifulsoup4 = "==4.12.2" billiard = "==3.6.4.0" bleach = "^6.1.0" blinker = "~=1.4" -boto3 = "==1.28.15" -botocore = "==1.31.15" +boto3 = "^1.28.66" +botocore = "^1.31.66" cachetools = "==5.3.1" celery = {version = "==5.2.7", extras = ["redis"]} certifi = ">=2022.12.7" diff --git a/tests/app/clients/test_document_download.py b/tests/app/clients/test_document_download.py index 96469ae93..be8f38e40 100644 --- a/tests/app/clients/test_document_download.py +++ b/tests/app/clients/test_document_download.py @@ -76,7 +76,7 @@ def test_should_raise_non_400_statuses_as_exceptions(document_download): document_download.upload_document("service-id", "abababab") assert ( - type(excinfo.value) == Exception + isinstance(excinfo.value) == Exception ) # make sure it's a base exception, so will be handled as a 500 by v2 api assert ( str(excinfo.value) @@ -98,6 +98,6 @@ def test_should_raise_exceptions_without_http_response_bodies_as_exceptions( document_download.upload_document("service-id", "abababab") assert ( - type(excinfo.value) == Exception + isinstance(excinfo.value) == Exception ) # make sure it's a base exception, so will be handled as a 500 by v2 api assert str(excinfo.value) == "Unhandled document download error: ConnectTimeout()" diff --git a/tests/app/test_model.py b/tests/app/test_model.py index 20a7763cb..bdfc4c6cb 100644 --- a/tests/app/test_model.py +++ b/tests/app/test_model.py @@ -403,7 +403,7 @@ def test_notification_get_created_by_email_address(sample_notification, sample_u def test_notification_history_from_original(sample_notification): history = NotificationHistory.from_original(sample_notification) - assert type(history) == NotificationHistory + assert isinstance(history) == NotificationHistory def test_rate_str():