Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pip/requirements/develop/zipp-…
Browse files Browse the repository at this point in the history
…3.20.1
  • Loading branch information
dkphm authored Aug 29, 2024
2 parents 2a5b89e + fbc7d6e commit 54e4444
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions requirements/reproducible-linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -939,9 +939,9 @@ types-python-dateutil==2.9.0.20240821 \
--hash=sha256:9649d1dcb6fef1046fb18bebe9ea2aa0028b160918518c34589a46045f6ebd98 \
--hash=sha256:f5889fcb4e63ed4aaa379b44f93c32593d50b9a94c9a60a0c854d8cc3511cd57
# via arrow
types-s3transfer==0.10.1 \
--hash=sha256:02154cce46528287ad76ad1a0153840e0492239a0887e8833466eccf84b98da0 \
--hash=sha256:49a7c81fa609ac1532f8de3756e64b58afcecad8767933310228002ec7adff74
types-s3transfer==0.10.2 \
--hash=sha256:60167a3bfb5c536ec6cdb5818f7f9a28edca9dc3e0b5ff85ae374526fc5e576e \
--hash=sha256:7a3fec8cd632e2b5efb665a355ef93c2a87fdd5a45b74a949f95a9e628a86356
# via boto3-stubs
typing-extensions==4.12.2 \
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
Expand Down
6 changes: 3 additions & 3 deletions requirements/reproducible-mac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -971,9 +971,9 @@ types-python-dateutil==2.9.0.20240821 \
--hash=sha256:9649d1dcb6fef1046fb18bebe9ea2aa0028b160918518c34589a46045f6ebd98 \
--hash=sha256:f5889fcb4e63ed4aaa379b44f93c32593d50b9a94c9a60a0c854d8cc3511cd57
# via arrow
types-s3transfer==0.10.1 \
--hash=sha256:02154cce46528287ad76ad1a0153840e0492239a0887e8833466eccf84b98da0 \
--hash=sha256:49a7c81fa609ac1532f8de3756e64b58afcecad8767933310228002ec7adff74
types-s3transfer==0.10.2 \
--hash=sha256:60167a3bfb5c536ec6cdb5818f7f9a28edca9dc3e0b5ff85ae374526fc5e576e \
--hash=sha256:7a3fec8cd632e2b5efb665a355ef93c2a87fdd5a45b74a949f95a9e628a86356
# via boto3-stubs
typing-extensions==4.12.2 \
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
Expand Down
6 changes: 3 additions & 3 deletions requirements/reproducible-win.txt
Original file line number Diff line number Diff line change
Expand Up @@ -959,9 +959,9 @@ types-python-dateutil==2.9.0.20240821 \
--hash=sha256:9649d1dcb6fef1046fb18bebe9ea2aa0028b160918518c34589a46045f6ebd98 \
--hash=sha256:f5889fcb4e63ed4aaa379b44f93c32593d50b9a94c9a60a0c854d8cc3511cd57
# via arrow
types-s3transfer==0.10.1 \
--hash=sha256:02154cce46528287ad76ad1a0153840e0492239a0887e8833466eccf84b98da0 \
--hash=sha256:49a7c81fa609ac1532f8de3756e64b58afcecad8767933310228002ec7adff74
types-s3transfer==0.10.2 \
--hash=sha256:60167a3bfb5c536ec6cdb5818f7f9a28edca9dc3e0b5ff85ae374526fc5e576e \
--hash=sha256:7a3fec8cd632e2b5efb665a355ef93c2a87fdd5a45b74a949f95a9e628a86356
# via boto3-stubs
typing-extensions==4.12.2 \
--hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/pipeline/test_bootstrap_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ def test_bootstrapped_buckets_accept_ssl_requests_only(self, bucket_logical_id):
# Assert non SSl requests are denied
with self.assertRaises(ClientError) as error:
s3_non_ssl_client.get_object(Bucket=bucket_name, Key=bucket_key)
self.assertEqual(
str(error.exception), "An error occurred (AccessDenied) when calling the GetObject operation: Access Denied"
self.assertTrue(
str(error.exception).startswith("An error occurred (AccessDenied) when calling the GetObject operation:")
)

def test_bootstrapped_artifacts_bucket_has_server_access_log_enabled(self):
Expand Down

0 comments on commit 54e4444

Please sign in to comment.