Skip to content

Commit

Permalink
Update all minor versions (master) (minor) (#2107)
Browse files Browse the repository at this point in the history
* Update all minor versions

* Ignore new Prospector errors

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Stéphane Brunner <stephane.brunner@camptocamp.com>
  • Loading branch information
renovate[bot] and sbrunner authored Feb 3, 2025
1 parent b927896 commit 3f1a986
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 66 deletions.
4 changes: 2 additions & 2 deletions c2cciutils/applications-versions.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://docs.renovatebot.com/modules/datasource/#github-releases-datasource
k3d-io/k3d: v5.7.5 # github-releases
postgresql: 16.3.5 # helm - https://charts.bitnami.com/bitnami
k3d-io/k3d: v5.8.1 # github-releases
postgresql: 16.4.5 # helm - https://charts.bitnami.com/bitnami
helm/chart-releaser: v1.7.0 # github-releases
8 changes: 4 additions & 4 deletions c2cciutils/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion c2cciutils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"description": "",
"author": "",
"dependencies": {
"snyk": "1.1294.3"
"snyk": "1.1295.2"
}
}
10 changes: 5 additions & 5 deletions c2cciutils/publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class GoogleCalendar:
def __init__(self) -> None:
"""Initialize."""
self.scopes = ["https://www.googleapis.com/auth/calendar"] # in fact it is better to hard-code this
self.credentials_pickle_file = os.environ.get("TMP_CREDS_FILE", f"/tmp/{uuid.uuid4()}.pickle") # noqa: S108
self.credentials_pickle_file = os.environ.get("TMP_CREDS_FILE", f"/tmp/{uuid.uuid4()}.pickle") # noqa: S108 # nosec
self.credentials_json_file = os.environ.get(
"GOOGLE_CREDS_JSON_FILE", "~/google-credentials-c2cibot.json"
) # used to refresh the refresh_token or to initialize the credentials the first time
Expand Down Expand Up @@ -62,7 +62,7 @@ def init_calendar_service(self) -> Credentials: # type: ignore
# time.
if os.path.exists(self.credentials_pickle_file):
with open(self.credentials_pickle_file, "rb") as token:
creds = pickle.load(token) # noqa: S301
creds = pickle.load(token) # noqa: S301 # nosec
# If there are no (valid) credentials available, let the user log in.
if not creds or not creds.valid: # pylint: disable=possibly-used-before-assignment
if creds and creds.expired and creds.refresh_token:
Expand Down Expand Up @@ -99,7 +99,7 @@ def print_all_calendars(self) -> None:
# list all the calendars that the user has access to.
# used to debug credentials
print("Getting list of calendars")
calendars_result = self.service.calendarList().list().execute()
calendars_result = self.service.calendarList().list().execute() # pylint: disable=no-member

calendars = calendars_result.get("items", [])

Expand All @@ -123,7 +123,7 @@ def print_latest_events(self, time_min: Optional[datetime.datetime] = None) -> N
if not time_min:
time_min = datetime.datetime.utcnow() - datetime.timedelta(days=30)
events_result = (
self.service.events()
self.service.events() # pylint: disable=no-member
.list(
calendarId=self.calendar_id,
timeMin=time_min.isoformat() + "Z",
Expand Down Expand Up @@ -164,7 +164,7 @@ def create_event(
"end": {"dateTime": end, "timeZone": "Europe/Zurich"},
}

event_result = self.service.events().insert(calendarId=self.calendar_id, body=body).execute()
event_result = self.service.events().insert(calendarId=self.calendar_id, body=body).execute() # pylint: disable=no-member
print(f"Created event with id: {event_result['id']}")

def save_credentials_to_gopass(self) -> None:
Expand Down
6 changes: 3 additions & 3 deletions c2cciutils/scripts/docker_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ def main() -> None:

# Store in /tmp/docker-logs-timestamp the current timestamp to avoid printing same logs multiple times.
timestamp_args = []
if os.path.exists("/tmp/docker-logs-timestamp"): # noqa: S108
with open("/tmp/docker-logs-timestamp", encoding="utf-8") as timestamp_file: # noqa: S108
if os.path.exists("/tmp/docker-logs-timestamp"): # noqa: S108 # nosec
with open("/tmp/docker-logs-timestamp", encoding="utf-8") as timestamp_file: # noqa: S108 # nosec
timestamp_args = [f"--since={timestamp_file.read().strip()}Z"]

with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file: # noqa: S108
with open("/tmp/docker-logs-timestamp", "w", encoding="utf-8") as timestamp_file: # noqa: S108 # nosec
timestamp_file.write(datetime.utcnow().isoformat())

for name in (
Expand Down
2 changes: 1 addition & 1 deletion c2cciutils/scripts/trigger_image_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def main() -> None:

def dispatch(repository: str, event_type: str, images_full: list[str]) -> None:
"""Trigger an image update on the argocd repository."""
id_ = random.randint(1, 100000) # noqa: S311
id_ = random.randint(1, 100000) # noqa: S311 # nosec
print(f"Triggering {event_type}:{id_} on {repository} with {','.join(images_full)}")

response = requests.post(
Expand Down
8 changes: 4 additions & 4 deletions example-project/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repos:
- id: trailing-whitespace
- id: mixed-line-ending
- repo: https://github.com/sbrunner/pre-commit-copyright
rev: 1.1.2
rev: 1.2.1
hooks:
- id: copyright
- repo: https://github.com/sbrunner/jsonschema-validator
Expand All @@ -42,7 +42,7 @@ repos:
- id: check-poetry
- id: lock-poetry
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
exclude: ^(.*/)?poetry\.lock$
Expand All @@ -64,7 +64,7 @@ repos:
hooks:
- id: git-check
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.30.0
rev: 0.31.1
hooks:
- id: check-github-workflows
- id: check-renovate
Expand Down Expand Up @@ -93,7 +93,7 @@ repos:
args:
- --py38-plus
- repo: https://github.com/PyCQA/prospector
rev: v1.13.3
rev: 1.14.0
hooks:
- id: prospector
args:
Expand Down
2 changes: 1 addition & 1 deletion example-project/ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
c2cciutils[checks,publish]==1.7.3
pre-commit==4.0.1
pre-commit==4.1.0
14 changes: 7 additions & 7 deletions example-project/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example-project/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ include = ["project/py.typed"]
python = ">=3.10,<3.13"

[tool.poetry.group.dev.dependencies]
prospector = { version = "1.13.3", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
prospector = { version = "1.14.0", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
prospector-profile-duplicated = "1.10.4"
prospector-profile-utils = "1.15.1"
prospector-profile-utils = "1.17.0"

[build-system]
requires = [
Expand Down
48 changes: 17 additions & 31 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ c2cciutils-docker-versions-gen = "c2cciutils.scripts.docker_versions_gen:main"
[tool.poetry.dependencies]
python = ">=3.9,<4.0"
requests = "2.32.3"
google-api-python-client = { version = "2.157.0", optional = true }
google-api-python-client = { version = "2.160.0", optional = true }
google-auth-httplib2 = { version = "0.2.0", optional = true }
google-auth-oauthlib = { version = "1.2.1", optional = true }
"ruamel.yaml" = "0.18.10"
defusedxml = "0.7.1"
twine = { version = "6.0.1", optional = true }
twine = { version = "6.1.0", optional = true }
debian-inspector = "31.1.0"
PyYAML = "6.0.2"
multi-repo-automation = { version="1.5.0", optional = true }
Expand All @@ -86,9 +86,9 @@ pr_checks = []
version = ["multi-repo-automation"]

[tool.poetry.group.dev.dependencies]
prospector = { version = "1.13.3", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff"] }
prospector = { version = "1.14.0", extras = ["with-bandit", "with-mypy", "with-pyroma", "with-ruff"] }
prospector-profile-duplicated = "1.10.4"
prospector-profile-utils = "1.15.1"
prospector-profile-utils = "1.17.0"
types-requests = "2.32.0.20241016"
types-pyyaml = "6.0.12.20241230"
types-markdown = "3.7.0.20241204"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ poetry==1.8.5
poetry-plugin-export==1.8.0
poetry-dynamic-versioning[plugin]==1.4.1
poetry-plugin-tweak-dependencies-version==1.5.2
pre-commit==4.0.1
pre-commit==4.1.0

0 comments on commit 3f1a986

Please sign in to comment.