From c9d7e0873a50ccf054f1148e258e68b321b3bb80 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 12 Mar 2026 15:27:54 +0100 Subject: [PATCH 1/3] Fix calling ocp_stream_generator Signed-off-by: Petr "Stone" Hracek --- .../ocp_stream_generator/stream_generator.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ocp-stream-generator/ocp_stream_generator/stream_generator.py b/ocp-stream-generator/ocp_stream_generator/stream_generator.py index 37b8d3d..5fbce65 100755 --- a/ocp-stream-generator/ocp_stream_generator/stream_generator.py +++ b/ocp-stream-generator/ocp_stream_generator/stream_generator.py @@ -26,11 +26,7 @@ import yaml import json import sys -from ocp_stream_generator.distribution_data import ( - abbreviations, - images, - latest_description, -) +from distribution_data import abbreviations, images, latest_description class YamlLoader: From 763066e7600b71f089f8d8e60f4230ba72198fd1 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 12 Mar 2026 15:45:43 +0100 Subject: [PATCH 2/3] Add fix for runngin stream_generator Signed-off-by: Petr "Stone" Hracek --- .pre-commit-config.yaml | 8 ++------ .../ocp_stream_generator/stream_generator.py | 11 ++++++++++- ocp-stream-generator/tests/test_imagestream_file.py | 1 - 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41985ef..ad09a9c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: black language_version: python3.6 - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.2.3 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-ast @@ -19,12 +19,8 @@ repos: exclude: tests/integration/conftest.py - id: end-of-file-fixer - id: trailing-whitespace - - id: flake8 - args: - - --max-line-length=100 - - --per-file-ignores=files/packit.wsgi:F401,E402 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.711 + rev: v1.2.0 hooks: - id: mypy args: [--no-strict-optional, --ignore-missing-imports] diff --git a/ocp-stream-generator/ocp_stream_generator/stream_generator.py b/ocp-stream-generator/ocp_stream_generator/stream_generator.py index 5fbce65..c351ab7 100755 --- a/ocp-stream-generator/ocp_stream_generator/stream_generator.py +++ b/ocp-stream-generator/ocp_stream_generator/stream_generator.py @@ -26,7 +26,16 @@ import yaml import json import sys -from distribution_data import abbreviations, images, latest_description + +from pathlib import Path + +sys.path.append(str(Path(__file__).parent.parent.absolute())) + +from ocp_stream_generator.distribution_data import ( + abbreviations, + images, + latest_description, +) class YamlLoader: diff --git a/ocp-stream-generator/tests/test_imagestream_file.py b/ocp-stream-generator/tests/test_imagestream_file.py index 62ef67d..119d962 100644 --- a/ocp-stream-generator/tests/test_imagestream_file.py +++ b/ocp-stream-generator/tests/test_imagestream_file.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 - from ocp_stream_generator.stream_generator import ImagestreamFile From 422440f1afef0c54df80ce3abaaef14ceb5471f8 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 12 Mar 2026 15:49:34 +0100 Subject: [PATCH 3/3] Add version back Signed-off-by: Petr "Stone" Hracek --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ad09a9c..93e89e3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: black language_version: python3.6 - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v2.2.3 hooks: - id: check-added-large-files - id: check-ast