Skip to content

Commit 2c719ed

Browse files
committed
Various minor updates and CVE fixes
1. Update from 3.12.11 to 3.12.13 2. Fixed black pre-commit to use 3.12 syntax 3. Bumped dependencies to resolve CVEs 4. Code Quality: Black formatting 5. Replaced i with _ in loop which is best practice
1 parent 1583e2e commit 2c719ed

6 files changed

Lines changed: 40 additions & 35 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repos:
33
rev: 24.4.2
44
hooks:
55
- id: black
6-
language_version: python3.10
6+
language_version: python3.12
77

88
- repo: https://github.com/Yelp/detect-secrets
99
rev: v1.4.0

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.12.11
1+
3.12.13

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build stage
22
# When upgrading Python versions, update '.python-version' to match
3-
FROM python:3.12.11 AS builder
3+
FROM python:3.12.13 AS builder
44

55
COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
66

@@ -24,7 +24,7 @@ RUN uv sync --locked --no-dev --no-editable
2424
################################################################################
2525
# Runtime stage
2626
# When upgrading Python versions, update '.python-version' to match
27-
FROM python:3.12.11-slim
27+
FROM python:3.12.13-slim
2828

2929
ENV DEBIAN_FRONTEND=noninteractive
3030
ENV LANG=C.UTF-8

jf_agent/main.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,9 @@ def obtain_jellyfish_endpoint_info(config, creds, skip_jf_ingest_issue_metadata:
607607
return JellyfishEndpointInfo(jira_info, git_instance_info, jf_options)
608608

609609

610-
def _get_additional_jira_issue_metadata(base_url: str, api_token: str, cursor: int, skip_ssl_verification: bool = False) -> dict:
610+
def _get_additional_jira_issue_metadata(
611+
base_url: str, api_token: str, cursor: int, skip_ssl_verification: bool = False
612+
) -> dict:
611613
headers = {'Jellyfish-API-Token': api_token}
612614
endpoint = f'{base_url}/endpoints/agent/jira-issue-metadata'
613615

@@ -733,9 +735,9 @@ def generate_manifests(config, creds, jellyfish_endpoint_info):
733735

734736
# far more straightforward than real bin packing because we have a set number of bins to start
735737
def _pack_bins(num_bins: int, packing_items: list[ProjectMetadata]) -> list:
736-
bins = [[] for i in range(num_bins)]
738+
bins = [[] for _ in range(num_bins)]
737739
bin_size = [
738-
0 for i in range(num_bins)
740+
0 for _ in range(num_bins)
739741
] # size is based on number of *repos* in a bin, not projects
740742

741743
for item in packing_items:

tests/test_config_file.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88

99
from jf_agent.config_file_reader import (
1010
GitConfig,
11+
ValidatedConfig,
1112
_get_git_config_from_yaml,
1213
_get_jf_ingest_git_auth_config,
14+
obtain_config,
1315
)
16+
from jf_agent.exception import BadConfigException
1417

1518

1619
class TestGitConfigGeneration(TestCase):

uv.lock

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)