Skip to content

Commit

Permalink
Add explicit dependency on antsibull-fileutils and use YAML module fr…
Browse files Browse the repository at this point in the history
…om there instead of antsibull-core.
  • Loading branch information
felixfontein committed Sep 9, 2024
1 parent baf285c commit 5416adc
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 8 deletions.
3 changes: 3 additions & 0 deletions changelogs/fragments/619-antsibull-fileutils.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
minor_changes:
- "Add dependency on antsibull-fileutils. Some functionality from antsibull-core is moving there, so we can use it from there directly
(https://github.com/ansible-community/antsibull/pull/619)."
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ requires-python = ">=3.9"
dependencies = [
"antsibull-changelog >= 0.24.0",
"antsibull-core >= 2.0.0, < 4.0.0",
"antsibull-fileutils >= 1.0.0, < 2.0.0",
"asyncio-pool",
"build",
"jinja2",
Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/build_ansible_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from antsibull_core.galaxy import CollectionDownloader, GalaxyContext
from antsibull_core.logging import log
from antsibull_core.subprocess_util import async_log_run, log_run
from antsibull_core.yaml import store_yaml_file, store_yaml_stream
from antsibull_fileutils.yaml import store_yaml_file, store_yaml_stream
from jinja2 import Template
from packaging.version import Version as PypiVer
from semantic_version import SimpleSpec as SemVerSpec
Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from antsibull_core.ansible_core import get_ansible_core
from antsibull_core.dependency_files import DependencyFileData, DepsFile
from antsibull_core.galaxy import CollectionDownloader, GalaxyContext
from antsibull_core.yaml import load_yaml_bytes
from antsibull_fileutils.yaml import load_yaml_bytes
from packaging.version import Version as PypiVer
from semantic_version import Version as SemVer

Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/collection_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import typing as t
from collections.abc import Mapping

from antsibull_core.yaml import load_yaml_file
from antsibull_fileutils.yaml import load_yaml_file


class CollectionMetadata:
Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/from_source/clone.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import aiofiles.ospath
from antsibull_core.logging import log
from antsibull_core.subprocess_util import async_log_run
from antsibull_core.yaml import load_yaml_file, store_yaml_file
from antsibull_fileutils.yaml import load_yaml_file, store_yaml_file

from antsibull.tagging import CollectionTagData
from antsibull.types import CollectionName
Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/from_source/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import asyncio_pool # type: ignore[import]
from antsibull_core import app_context
from antsibull_core.subprocess_util import async_log_run
from antsibull_core.yaml import load_yaml_file, store_yaml_file
from antsibull_fileutils.yaml import load_yaml_file, store_yaml_file

from antsibull.build_ansible_commands import download_collections
from antsibull.tagging import CollectionTagData
Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/sanity_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from antsibull_core import app_context
from antsibull_core.logging import log
from antsibull_core.subprocess_util import log_run
from antsibull_core.yaml import store_yaml_file
from antsibull_fileutils.yaml import store_yaml_file
from packaging.version import Version

from antsibull.constants import SANITY_TESTS_BANNED_IGNORES, SANITY_TESTS_DEFAULT
Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/tagging.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from antsibull_core import app_context
from antsibull_core.dependency_files import DepsFile
from antsibull_core.logging import log
from antsibull_core.yaml import load_yaml_file, store_yaml_file
from antsibull_fileutils.yaml import load_yaml_file, store_yaml_file

from antsibull.collection_meta import CollectionMetadata, CollectionsMetadata

Expand Down
2 changes: 1 addition & 1 deletion src/antsibull/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import TYPE_CHECKING, Any, TypeVar

import yaml
from antsibull_core.yaml import load_yaml_file
from antsibull_fileutils.yaml import load_yaml_file

if TYPE_CHECKING:
from _typeshed import StrPath
Expand Down

0 comments on commit 5416adc

Please sign in to comment.