Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pin boto3 to before aws broke it for third parties #422

Merged
merged 5 commits into from
Feb 7, 2025
Merged

pin boto3 to before aws broke it for third parties #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c103fcf
pin boto3 version
dsschult Feb 7, 2025
592661c
<bot> update requirements-docs.txt
invalid-email-address Feb 7, 2025
06d8029
<bot> update requirements-tests.txt
invalid-email-address Feb 7, 2025
9b9c821
<bot> update requirements.txt
invalid-email-address Feb 7, 2025
7df495b
only monitor active datasets
dsschult Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions iceprod/scheduled_tasks/dataset_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ async def process_dataset(rest_client, dataset_id):
dataset = await rest_client.request('GET', f'/datasets/{dataset_id}')
dataset_num = dataset['dataset']
dataset_status = dataset['status']
if dataset_status != 'processing':
return

with DatasetMonitorDuration.labels(name='dataset_monitor', dataset=str(dataset_num)).time():
jobs = await rest_client.request('GET', f'/datasets/{dataset_id}/job_counts/status')
jobs_counter = Counter()
Expand Down
6 changes: 3 additions & 3 deletions requirements-docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ attrs==25.1.0
# referencing
babel==2.17.0
# via sphinx
boto3==1.36.15
boto3==1.35.99
# via iceprod (setup.py)
botocore==1.36.15
botocore==1.35.99
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -129,7 +129,7 @@ rpds-py==0.22.3
# via
# jsonschema
# referencing
s3transfer==0.11.2
s3transfer==0.10.4
# via boto3
setproctitle==1.3.4
# via iceprod (setup.py)
Expand Down
6 changes: 3 additions & 3 deletions requirements-tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ attrs==25.1.0
# referencing
beautifulsoup4==4.13.3
# via iceprod (setup.py)
boto3==1.36.15
boto3==1.35.99
# via
# iceprod (setup.py)
# moto
botocore==1.36.15
botocore==1.35.99
# via
# boto3
# moto
Expand Down Expand Up @@ -179,7 +179,7 @@ rpds-py==0.22.3
# via
# jsonschema
# referencing
s3transfer==0.11.2
s3transfer==0.10.4
# via boto3
setproctitle==1.3.4
# via iceprod (setup.py)
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ attrs==25.1.0
# via
# jsonschema
# referencing
boto3==1.36.15
boto3==1.35.99
# via iceprod (setup.py)
botocore==1.36.15
botocore==1.35.99
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -112,7 +112,7 @@ rpds-py==0.22.3
# via
# jsonschema
# referencing
s3transfer==0.11.2
s3transfer==0.10.4
# via boto3
setproctitle==1.3.4
# via iceprod (setup.py)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ branch = master
install_requires =
PyYAML
asyncache
boto3
boto3<1.36
cachetools
certifi
cryptography
Expand Down