Skip to content

Commit

Permalink
Rename osversion -> os_version
Browse files Browse the repository at this point in the history
This module name is more readable
  • Loading branch information
dcermak committed Oct 9, 2024
1 parent dff3483 commit 4f2040e
Show file tree
Hide file tree
Showing 32 changed files with 62 additions and 62 deletions.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/bci_build/package/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/apache_tomcat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/appcontainers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/package/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/bci_build/package/basecontainers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/gcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/golang.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/package/helpers.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/kiwi.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/mariadb.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/package/openjdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/php.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/postfix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/package/postgres.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/rmt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/ruby.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/bci_build/package/rust.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/bci_build/package/spack.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/package/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/dotnet/updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/staging/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/staging/project_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import jinja2

from bci_build.osversion import OsVersion
from bci_build.os_version import OsVersion

USERS_FOR_PRODUCTION = [
"avicenzi",
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test_bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion tests/test_build_recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_crate.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_project_setup.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_service.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 4f2040e

Please sign in to comment.