Skip to content

Commit

Permalink
chore(deps)!: update all dependencies to latest
Browse files Browse the repository at this point in the history
Specifically:
boto3 to 1.28.80
click to 8.1.7
typing_extensions to 4.8
xxhash to 3.4

And testing dependencies:
deadline-cloud-test-fixtures to 0.5.0
coverage to 7.3
pytest-timeout to 2.2
mypy to 1.6
tuff to 0.1.4

Signed-off-by: Daniel Neilson <[email protected]>
  • Loading branch information
ddneilson committed Nov 8, 2023
1 parent bc60165 commit a8e6653
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 26 deletions.
15 changes: 9 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ readme = "README.md"
license = ""
requires-python = ">=3.7"

# Note: All deps should be using >= since this is a *library* as well as an application.
# Applications that consume this library should be the ones that are more strictly
# limiting dependencies if they want/need to.
dependencies = [
"boto3 ~= 1.26",
# 8.1.4 failing with mypy
"click == 8.1.3",
"pyyaml ~= 6.0",
"boto3 >= 1.28.80",
"click >= 8.1.7",
"pyyaml >= 6.0",
# Job Attachments
"typing_extensions ~= 4.5",
"xxhash ~= 3.2",
"typing_extensions == 4.7.*; python_version == '3.7'",
"typing_extensions >= 4.8; python_version > '3.7'",
"xxhash >= 3.4",
# Pinning due to new 4.18 dependencies breaking pyinstaller implementation
"jsonschema == 4.17.*",
]
Expand Down
2 changes: 1 addition & 1 deletion requirements-integ-testing.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
deadline-cloud-test-fixtures ~= 0.3.0
deadline-cloud-test-fixtures ~= 0.5.0
10 changes: 6 additions & 4 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
coverage[toml] ~= 7.2
coverage[toml] ~= 7.2; python_version == '3.7'
coverage[toml] ~= 7.3; python_version > '3.7'
pytest ~= 7.4
pytest-cov ~= 4.1
pytest-timeout ~= 2.1
pytest-timeout ~= 2.2
pytest-xdist ~= 3.3
freezegun ~= 1.2
types-pyyaml ~= 6.0
twine ~= 4.0
black == 23.3.*; python_version == '3.7'
black == 23.*; python_version > '3.7'
mypy ~= 1.4
ruff ~= 0.0.290
mypy ~= 1.4; python_version == '3.7'
mypy ~= 1.6; python_version > '3.7'
ruff ~= 0.1.4
moto ~= 4.2
jsondiff ~= 2.0
30 changes: 16 additions & 14 deletions src/deadline/client/cli/_groups/bundle_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,9 @@ def _hash_attachments(
Starts the job attachments hashing and handles the progress reporting
callback. Returns a list of the asset manifests of the hashed files.
"""

with click.progressbar(length=100, label="Hashing Attachments") as hashing_progress:
# Note: click doesn't export the return type of progressbar(), so we suppress mypy warnings for
# not annotating the type of hashing_progress.
with click.progressbar(length=100, label="Hashing Attachments") as hashing_progress: # type: ignore[var-annotated]

def _update_hash_progress(hashing_metadata: ProgressReportMetadata) -> bool:
new_progress = int(hashing_metadata.progress) - hashing_progress.pos
Expand Down Expand Up @@ -370,19 +371,20 @@ def _upload_attachments(
# TODO: remove logging level setting when the max number connections for boto3 client
# in Job Attachments library can be increased (currently using default number, 10, which
# makes it keep logging urllib3 warning messages when uploading large files)
with click.progressbar(
length=100, label="Uploading Attachments"
) as upload_progress, _modified_logging_level(logging.getLogger("urllib3"), logging.ERROR):

def _update_upload_progress(upload_metadata: ProgressReportMetadata) -> bool:
new_progress = int(upload_metadata.progress) - upload_progress.pos
if new_progress > 0:
upload_progress.update(new_progress)
return continue_submission
with _modified_logging_level(logging.getLogger("urllib3"), logging.ERROR):
# Note: click doesn't export the return type of progressbar(), so we suppress mypy warnings for
# not annotating the type of hashing_progress.
with click.progressbar(length=100, label="Uploading Attachments") as upload_progress: # type: ignore[var-annotated]

def _update_upload_progress(upload_metadata: ProgressReportMetadata) -> bool:
new_progress = int(upload_metadata.progress) - upload_progress.pos
if new_progress > 0:
upload_progress.update(new_progress)
return continue_submission

upload_summary, attachment_settings = asset_manager.upload_assets(
manifests, _update_upload_progress
)
upload_summary, attachment_settings = asset_manager.upload_assets(
manifests, _update_upload_progress
)

api.get_deadline_cloud_library_telemetry_client(config=config).record_upload_summary(
upload_summary
Expand Down
4 changes: 3 additions & 1 deletion src/deadline/client/cli/_groups/job_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ def _download_job_output(
# makes it keep logging urllib3 warning messages when downloading large files)
with _modified_logging_level(logging.getLogger("urllib3"), logging.ERROR):
if not is_json_format:
with click.progressbar(length=100, label="Downloading Outputs") as download_progress:
# Note: click doesn't export the return type of progressbar(), so we suppress mypy warnings for
# not annotating the type of download_progress.
with click.progressbar(length=100, label="Downloading Outputs") as download_progress: # type: ignore[var-annotated]

def _update_download_progress(download_metadata: ProgressReportMetadata) -> bool:
new_progress = int(download_metadata.progress) - download_progress.pos
Expand Down

0 comments on commit a8e6653

Please sign in to comment.