From 4f2040e3de9cdc973c77a129f80d56c4044bfa49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 7 Oct 2024 15:50:30 +0200 Subject: [PATCH] Rename osversion -> os_version This module name is more readable --- src/bci_build/{osversion.py => os_version.py} | 0 src/bci_build/package/__init__.py | 6 +++--- src/bci_build/package/apache_tomcat.py | 4 ++-- src/bci_build/package/appcontainers.py | 6 +++--- src/bci_build/package/base.py | 2 +- src/bci_build/package/basecontainers.py | 12 ++++++------ src/bci_build/package/gcc.py | 4 ++-- src/bci_build/package/golang.py | 4 ++-- src/bci_build/package/helpers.py | 2 +- src/bci_build/package/kiwi.py | 6 +++--- src/bci_build/package/mariadb.py | 6 +++--- src/bci_build/package/node.py | 6 +++--- src/bci_build/package/openjdk.py | 2 +- src/bci_build/package/php.py | 4 ++-- src/bci_build/package/postfix.py | 6 +++--- src/bci_build/package/postgres.py | 2 +- src/bci_build/package/python.py | 6 +++--- src/bci_build/package/rmt.py | 4 ++-- src/bci_build/package/ruby.py | 4 ++-- src/bci_build/package/rust.py | 4 ++-- src/bci_build/package/spack.py | 6 +++--- src/bci_build/package/versions.py | 2 +- src/bci_build/registry.py | 2 +- src/dotnet/updater.py | 4 ++-- src/staging/bot.py | 4 ++-- src/staging/project_setup.py | 2 +- tests/conftest.py | 2 +- tests/test_bot.py | 4 ++-- tests/test_build_recipe.py | 2 +- tests/test_crate.py | 2 +- tests/test_project_setup.py | 2 +- tests/test_service.py | 2 +- 32 files changed, 62 insertions(+), 62 deletions(-) rename src/bci_build/{osversion.py => os_version.py} (100%) diff --git a/src/bci_build/osversion.py b/src/bci_build/os_version.py similarity index 100% rename from src/bci_build/osversion.py rename to src/bci_build/os_version.py diff --git a/src/bci_build/package/__init__.py b/src/bci_build/package/__init__.py index 9ff23f405..df61b02ef 100644 --- a/src/bci_build/package/__init__.py +++ b/src/bci_build/package/__init__.py @@ -17,9 +17,9 @@ from packaging import version from bci_build.containercrate import ContainerCrate -from bci_build.osversion import ALL_OS_LTSS_VERSIONS -from bci_build.osversion import RELEASED_OS_VERSIONS -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_OS_LTSS_VERSIONS +from bci_build.os_version import RELEASED_OS_VERSIONS +from bci_build.os_version import OsVersion from bci_build.registry import ApplicationCollectionRegistry from bci_build.registry import Registry from bci_build.registry import publish_registry diff --git a/src/bci_build/package/apache_tomcat.py b/src/bci_build/package/apache_tomcat.py index 998af5fb5..8a04f9bbc 100644 --- a/src/bci_build/package/apache_tomcat.py +++ b/src/bci_build/package/apache_tomcat.py @@ -3,8 +3,8 @@ import datetime from bci_build.containercrate import ContainerCrate -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import ApplicationStackContainer from bci_build.package import OsContainer diff --git a/src/bci_build/package/appcontainers.py b/src/bci_build/package/appcontainers.py index a84ef75a8..23d1cec7d 100644 --- a/src/bci_build/package/appcontainers.py +++ b/src/bci_build/package/appcontainers.py @@ -2,9 +2,9 @@ from pathlib import Path -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import ApplicationStackContainer from bci_build.package import BuildType diff --git a/src/bci_build/package/base.py b/src/bci_build/package/base.py index 036cbd2a5..945cdf341 100644 --- a/src/bci_build/package/base.py +++ b/src/bci_build/package/base.py @@ -5,7 +5,7 @@ from jinja2 import Template -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import Arch from bci_build.package import BuildType from bci_build.package import OsContainer diff --git a/src/bci_build/package/basecontainers.py b/src/bci_build/package/basecontainers.py index 5169a534b..cabb39bac 100644 --- a/src/bci_build/package/basecontainers.py +++ b/src/bci_build/package/basecontainers.py @@ -5,12 +5,12 @@ import textwrap from pathlib import Path -from bci_build.osversion import ALL_BASE_OS_VERSIONS -from bci_build.osversion import ALL_OS_LTSS_VERSIONS -from bci_build.osversion import ALL_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import _SUPPORTED_UNTIL_SLE -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_BASE_OS_VERSIONS +from bci_build.os_version import ALL_OS_LTSS_VERSIONS +from bci_build.os_version import ALL_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import _SUPPORTED_UNTIL_SLE +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import Arch from bci_build.package import BuildType diff --git a/src/bci_build/package/gcc.py b/src/bci_build/package/gcc.py index 56dd9cdc1..832e0ea1e 100644 --- a/src/bci_build/package/gcc.py +++ b/src/bci_build/package/gcc.py @@ -3,8 +3,8 @@ import datetime from typing import Literal -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import DevelopmentContainer from bci_build.package import ParseVersion diff --git a/src/bci_build/package/golang.py b/src/bci_build/package/golang.py index 1acd6c90f..23ca1c80d 100644 --- a/src/bci_build/package/golang.py +++ b/src/bci_build/package/golang.py @@ -4,8 +4,8 @@ from itertools import product from typing import Literal -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import LOG_CLEAN from bci_build.package import DevelopmentContainer diff --git a/src/bci_build/package/helpers.py b/src/bci_build/package/helpers.py index ea6c5fcd6..b9f64e515 100644 --- a/src/bci_build/package/helpers.py +++ b/src/bci_build/package/helpers.py @@ -1,4 +1,4 @@ -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import RELEASED_OS_VERSIONS from bci_build.package import OsContainer diff --git a/src/bci_build/package/kiwi.py b/src/bci_build/package/kiwi.py index 3f9c300f7..0e5b7abaa 100644 --- a/src/bci_build/package/kiwi.py +++ b/src/bci_build/package/kiwi.py @@ -1,8 +1,8 @@ """KIWI Appliances Builder SDK container for easy appliance building on SLE Micro.""" -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import BuildType from bci_build.package import DevelopmentContainer from bci_build.package import ParseVersion diff --git a/src/bci_build/package/mariadb.py b/src/bci_build/package/mariadb.py index c29dab48e..89c31e154 100644 --- a/src/bci_build/package/mariadb.py +++ b/src/bci_build/package/mariadb.py @@ -3,9 +3,9 @@ import re from pathlib import Path -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import ApplicationStackContainer from bci_build.package import BuildType diff --git a/src/bci_build/package/node.py b/src/bci_build/package/node.py index 246494b7b..c3a53bc69 100644 --- a/src/bci_build/package/node.py +++ b/src/bci_build/package/node.py @@ -3,9 +3,9 @@ import datetime from typing import Literal -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import _SUPPORTED_UNTIL_SLE -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import _SUPPORTED_UNTIL_SLE +from bci_build.os_version import OsVersion from bci_build.package import DevelopmentContainer from bci_build.package import Replacement from bci_build.package import SupportLevel diff --git a/src/bci_build/package/openjdk.py b/src/bci_build/package/openjdk.py index 9fe5acf4b..6064c88b5 100644 --- a/src/bci_build/package/openjdk.py +++ b/src/bci_build/package/openjdk.py @@ -4,7 +4,7 @@ from itertools import product from typing import Literal -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import Arch from bci_build.package import DevelopmentContainer diff --git a/src/bci_build/package/php.py b/src/bci_build/package/php.py index 340b9b70d..fd6f9de65 100644 --- a/src/bci_build/package/php.py +++ b/src/bci_build/package/php.py @@ -2,8 +2,8 @@ from itertools import product from typing import Literal -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import _BASH_SET from bci_build.package import DevelopmentContainer diff --git a/src/bci_build/package/postfix.py b/src/bci_build/package/postfix.py index f18f54026..644cd11bb 100644 --- a/src/bci_build/package/postfix.py +++ b/src/bci_build/package/postfix.py @@ -2,9 +2,9 @@ from pathlib import Path -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import ApplicationStackContainer from bci_build.package import ParseVersion diff --git a/src/bci_build/package/postgres.py b/src/bci_build/package/postgres.py index da5431c24..050c0c671 100644 --- a/src/bci_build/package/postgres.py +++ b/src/bci_build/package/postgres.py @@ -2,7 +2,7 @@ from pathlib import Path -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import ApplicationStackContainer from bci_build.package import ParseVersion diff --git a/src/bci_build/package/python.py b/src/bci_build/package/python.py index ef35c3dc4..de7977adc 100644 --- a/src/bci_build/package/python.py +++ b/src/bci_build/package/python.py @@ -4,9 +4,9 @@ from dataclasses import dataclass from typing import Literal -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import _SUPPORTED_UNTIL_SLE -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import _SUPPORTED_UNTIL_SLE +from bci_build.os_version import OsVersion from bci_build.package import DevelopmentContainer from bci_build.package import Replacement from bci_build.package import SupportLevel diff --git a/src/bci_build/package/rmt.py b/src/bci_build/package/rmt.py index 015b21c91..142cf3087 100644 --- a/src/bci_build/package/rmt.py +++ b/src/bci_build/package/rmt.py @@ -2,8 +2,8 @@ from pathlib import Path -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION from bci_build.package import DOCKERFILE_RUN from bci_build.package import ApplicationStackContainer from bci_build.package import BuildType diff --git a/src/bci_build/package/ruby.py b/src/bci_build/package/ruby.py index 0d6caa9e5..2b3a75b49 100644 --- a/src/bci_build/package/ruby.py +++ b/src/bci_build/package/ruby.py @@ -2,8 +2,8 @@ from typing import Literal -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import DevelopmentContainer from bci_build.package import ParseVersion from bci_build.package import Replacement diff --git a/src/bci_build/package/rust.py b/src/bci_build/package/rust.py index 987fc3222..7bc7672eb 100644 --- a/src/bci_build/package/rust.py +++ b/src/bci_build/package/rust.py @@ -3,8 +3,8 @@ import datetime from itertools import product -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION from bci_build.package import DevelopmentContainer from bci_build.package import Replacement from bci_build.package import SupportLevel diff --git a/src/bci_build/package/spack.py b/src/bci_build/package/spack.py index 718c74c2a..949b36c1e 100644 --- a/src/bci_build/package/spack.py +++ b/src/bci_build/package/spack.py @@ -1,8 +1,8 @@ """HPC container for Spack package manager.""" -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import _SUPPORTED_UNTIL_SLE -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import _SUPPORTED_UNTIL_SLE +from bci_build.os_version import OsVersion from bci_build.package import DOCKERFILE_RUN from bci_build.package import Arch from bci_build.package import DevelopmentContainer diff --git a/src/bci_build/package/versions.py b/src/bci_build/package/versions.py index 403448d5b..5de67d01e 100644 --- a/src/bci_build/package/versions.py +++ b/src/bci_build/package/versions.py @@ -76,7 +76,7 @@ from py_obs.osc import Osc from py_obs.project import fetch_package_info -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import ParseVersion _VERS_FMT_KEY = "version_format" diff --git a/src/bci_build/registry.py b/src/bci_build/registry.py index bdeb31589..faaf6dde5 100644 --- a/src/bci_build/registry.py +++ b/src/bci_build/registry.py @@ -5,7 +5,7 @@ from abc import abstractmethod from dataclasses import dataclass -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion @dataclass(frozen=True, kw_only=True) diff --git a/src/dotnet/updater.py b/src/dotnet/updater.py index b7679eded..756522ed7 100644 --- a/src/dotnet/updater.py +++ b/src/dotnet/updater.py @@ -22,8 +22,8 @@ from packaging import version from bci_build.logger import LOGGER -from bci_build.osversion import CAN_BE_LATEST_OS_VERSION -from bci_build.osversion import OsVersion +from bci_build.os_version import CAN_BE_LATEST_OS_VERSION +from bci_build.os_version import OsVersion from bci_build.package import LOG_CLEAN from bci_build.package import DevelopmentContainer from bci_build.package import generate_disk_size_constraints diff --git a/src/staging/bot.py b/src/staging/bot.py index 49b8b017c..cc0b56d0f 100644 --- a/src/staging/bot.py +++ b/src/staging/bot.py @@ -34,7 +34,7 @@ from oras.client import OrasClient from bci_build.logger import LOGGER -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import ALL_CONTAINER_IMAGE_NAMES from bci_build.package import BaseContainerImage from dotnet.updater import DOTNET_CONTAINERS @@ -1560,7 +1560,7 @@ def main() -> None: import sys from typing import Any - from bci_build.osversion import ALL_OS_VERSIONS + from bci_build.os_version import ALL_OS_VERSIONS from staging.build_result import is_build_failed from staging.build_result import render_as_markdown diff --git a/src/staging/project_setup.py b/src/staging/project_setup.py index ea3b6179c..3575374fa 100644 --- a/src/staging/project_setup.py +++ b/src/staging/project_setup.py @@ -4,7 +4,7 @@ import jinja2 -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion USERS_FOR_PRODUCTION = [ "avicenzi", diff --git a/tests/conftest.py b/tests/conftest.py index 258cc885e..55af71314 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -9,7 +9,7 @@ from _pytest.fixtures import SubRequest from _pytest.python import Metafunc -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import ApplicationStackContainer from bci_build.package import BaseContainerImage from bci_build.package import DevelopmentContainer diff --git a/tests/test_bot.py b/tests/test_bot.py index 3ec8ead9e..d58f9668a 100644 --- a/tests/test_bot.py +++ b/tests/test_bot.py @@ -4,8 +4,8 @@ import pytest import yaml -from bci_build.osversion import ALL_NONBASE_OS_VERSIONS -from bci_build.osversion import OsVersion +from bci_build.os_version import ALL_NONBASE_OS_VERSIONS +from bci_build.os_version import OsVersion from staging.bot import StagingBot diff --git a/tests/test_build_recipe.py b/tests/test_build_recipe.py index 92ed6a4af..a3374ca79 100644 --- a/tests/test_build_recipe.py +++ b/tests/test_build_recipe.py @@ -2,7 +2,7 @@ import pytest -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import Arch from bci_build.package import BuildType from bci_build.package import DevelopmentContainer diff --git a/tests/test_crate.py b/tests/test_crate.py index c37f2f859..b682469b1 100644 --- a/tests/test_crate.py +++ b/tests/test_crate.py @@ -1,5 +1,5 @@ from bci_build.containercrate import ContainerCrate -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import BuildType from bci_build.package import DevelopmentContainer diff --git a/tests/test_project_setup.py b/tests/test_project_setup.py index 44f466d2e..ee2190cc8 100644 --- a/tests/test_project_setup.py +++ b/tests/test_project_setup.py @@ -1,6 +1,6 @@ import pytest -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from staging.project_setup import ProjectType from staging.project_setup import generate_meta diff --git a/tests/test_service.py b/tests/test_service.py index ab41e018f..0c2a69228 100644 --- a/tests/test_service.py +++ b/tests/test_service.py @@ -1,5 +1,5 @@ from bci_build.containercrate import ContainerCrate -from bci_build.osversion import OsVersion +from bci_build.os_version import OsVersion from bci_build.package import BuildType from bci_build.package import DevelopmentContainer from bci_build.package import ParseVersion