diff --git a/.github/workflows/antsibull-build.yml b/.github/workflows/antsibull-build.yml index a4a6da33..0ac9c60a 100644 --- a/.github/workflows/antsibull-build.yml +++ b/.github/workflows/antsibull-build.yml @@ -59,10 +59,10 @@ jobs: antsibull_fileutils_ref: main steps: - - name: Check out antsibull + - name: Check out antsibull-build uses: actions/checkout@v4 with: - path: antsibull + path: antsibull-build - name: Check out dependent project antsibull-changelog uses: actions/checkout@v4 @@ -111,16 +111,16 @@ jobs: - name: "Test building a release: ${{ matrix.name }}" run: | nox -e coverage_release -- ${{ matrix.options }} - working-directory: antsibull + working-directory: antsibull-build - name: Report coverage run: | nox -v -e coverage - working-directory: antsibull + working-directory: antsibull-build - name: Upload coverage uses: codecov/codecov-action@v4 with: - working-directory: antsibull + working-directory: antsibull-build env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/nox.yml b/.github/workflows/nox.yml index 932da15c..5ab11982 100644 --- a/.github/workflows/nox.yml +++ b/.github/workflows/nox.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: antsibull + working-directory: antsibull-build strategy: fail-fast: false matrix: @@ -55,10 +55,10 @@ jobs: packages: "" name: "Run nox ${{ matrix.session }} session" steps: - - name: Check out antsibull + - name: Check out antsibull-build uses: actions/checkout@v4 with: - path: antsibull + path: antsibull-build - name: Check out dependent project antsibull-core uses: actions/checkout@v4 with: @@ -106,7 +106,7 @@ jobs: if: ${{ matrix.codecov }} uses: codecov/codecov-action@v4 with: - working-directory: antsibull + working-directory: antsibull-build name: "${{ matrix.session }}" env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/codecov.yml b/codecov.yml index 9d5db5b8..a01e1838 100644 --- a/codecov.yml +++ b/codecov.yml @@ -27,4 +27,4 @@ github_checks: annotations: false fixes: - - "antsibull/::" + - "antsibull_build/::" diff --git a/noxfile.py b/noxfile.py index 6ffe731d..9b7b564d 100644 --- a/noxfile.py +++ b/noxfile.py @@ -91,7 +91,7 @@ def test(session: nox.Session): session.run( "pytest", "--cov-branch", - "--cov=antsibull", + "--cov=antsibull_build", "--cov-report", "term-missing", *more_args, @@ -102,9 +102,7 @@ def test(session: nox.Session): @contextlib.contextmanager def coverage_run(session: nox.Session) -> Iterator[tuple[str, dict[str, str]]]: - build_command = ( - "coverage run -p --branch --source antsibull -m antsibull.cli.antsibull_build" - ) + build_command = "coverage run -p --branch --source antsibull_build -m antsibull_build.cli.antsibull_build" tmp = Path(session.create_tmp()) covfile = tmp / ".coverage" cov_env = {"COVERAGE_FILE": f"{covfile}", **session.env} @@ -193,8 +191,8 @@ def formatters(session: nox.Session): @nox.session def codeqa(session: nox.Session): install(session, ".[codeqa]", *other_antsibull(), editable=True) - session.run("flake8", "src/antsibull", *session.posargs) - session.run("pylint", "--rcfile", ".pylintrc.automated", "src/antsibull") + session.run("flake8", "src/antsibull_build", *session.posargs) + session.run("pylint", "--rcfile", ".pylintrc.automated", "src/antsibull_build") session.run("reuse", "lint") session.run("antsibull-changelog", "lint") @@ -203,7 +201,7 @@ def codeqa(session: nox.Session): def typing(session: nox.Session): others = other_antsibull() install(session, ".[typing]", *others) - session.run("mypy", "src/antsibull") + session.run("mypy", "src/antsibull_build") @nox.session @@ -252,7 +250,7 @@ def check_package_files( "run", "-p", "--branch", - "--source=antsibull", + "--source=antsibull_build", "tests/verify_package_files.py", "check", f"--data-dir={build_data / major}", @@ -332,7 +330,11 @@ def bump(session: nox.Session): with open(fragment_file, "w") as fp: fp.write(fragment) session.run( - "git", "add", "src/antsibull/__init__.py", str(fragment_file), external=True + "git", + "add", + "src/antsibull_build/__init__.py", + str(fragment_file), + external=True, ) session.run("git", "commit", "-m", f"Prepare {version}.", external=True) session.run("antsibull-changelog", "release") @@ -345,7 +347,7 @@ def bump(session: nox.Session): "changelogs/fragments/", # src/antsibull/__init__.py is not committed in the last step # when the release_summary fragment is created manually - "src/antsibull/__init__.py", + "src/antsibull_build/__init__.py", external=True, ) install(session, ".") # Smoke test @@ -371,7 +373,7 @@ def publish(session: nox.Session): install(session, "hatch") session.run("hatch", "publish", *session.posargs) session.run("hatch", "version", "post") - session.run("git", "add", "src/antsibull/__init__.py", external=True) + session.run("git", "add", "src/antsibull_build/__init__.py", external=True) session.run("git", "commit", "-m", "Post-release version bump.", external=True) diff --git a/pyproject.toml b/pyproject.toml index 21b67a2f..16a87b05 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,7 +67,7 @@ email = "maxwell@gtmx.me" "Changelog" = "https://github.com/ansible-community/antsibull-build/tree/main/CHANGELOG.md" [project.scripts] -antsibull-build = "antsibull.cli.antsibull_build:main" +antsibull-build = "antsibull_build.cli.antsibull_build:main" [project.optional-dependencies] # User-facing extras @@ -118,10 +118,10 @@ dev = [ ] [tool.hatch.version] -path = "src/antsibull/__init__.py" +path = "src/antsibull_build/__init__.py" [tool.hatch.build.targets.wheel] -packages = ["src/antsibull"] +packages = ["src/antsibull_build"] [tool.isort] profile = "black" diff --git a/src/antsibull/__init__.py b/src/antsibull_build/__init__.py similarity index 100% rename from src/antsibull/__init__.py rename to src/antsibull_build/__init__.py diff --git a/src/antsibull/_vendor/__init__.py b/src/antsibull_build/_vendor/__init__.py similarity index 100% rename from src/antsibull/_vendor/__init__.py rename to src/antsibull_build/_vendor/__init__.py diff --git a/src/antsibull/_vendor/shutil.py b/src/antsibull_build/_vendor/shutil.py similarity index 100% rename from src/antsibull/_vendor/shutil.py rename to src/antsibull_build/_vendor/shutil.py diff --git a/src/antsibull/announcements.py b/src/antsibull_build/announcements.py similarity index 98% rename from src/antsibull/announcements.py rename to src/antsibull_build/announcements.py index 1af7c4ed..efd9365a 100644 --- a/src/antsibull/announcements.py +++ b/src/antsibull_build/announcements.py @@ -30,8 +30,8 @@ from packaging.version import Version as PypiVer from typing_extensions import TypedDict -from antsibull.constants import ANSIBLE_FORUM_URL, BUILD_DATA_URL -from antsibull.pypi import PyPIClient, SdistAndWheelPair, UrlInfo +from antsibull_build.constants import ANSIBLE_FORUM_URL, BUILD_DATA_URL +from antsibull_build.pypi import PyPIClient, SdistAndWheelPair, UrlInfo try: import pyperclip # type: ignore[import] diff --git a/src/antsibull/build_ansible_commands.py b/src/antsibull_build/build_ansible_commands.py similarity index 99% rename from src/antsibull/build_ansible_commands.py rename to src/antsibull_build/build_ansible_commands.py index 77e45cd8..2f53b4d1 100644 --- a/src/antsibull/build_ansible_commands.py +++ b/src/antsibull_build/build_ansible_commands.py @@ -31,8 +31,8 @@ from semantic_version import SimpleSpec as SemVerSpec from semantic_version import Version as SemVer -from antsibull.constants import MINIMUM_ANSIBLE_VERSIONS -from antsibull.python_metadata import BuildMetaMaker, LegacyBuildMetaMaker +from antsibull_build.constants import MINIMUM_ANSIBLE_VERSIONS +from antsibull_build.python_metadata import BuildMetaMaker, LegacyBuildMetaMaker from . import __version__ as antsibull_version from .build_changelog import ReleaseNotes diff --git a/src/antsibull/build_changelog.py b/src/antsibull_build/build_changelog.py similarity index 100% rename from src/antsibull/build_changelog.py rename to src/antsibull_build/build_changelog.py diff --git a/src/antsibull/build_data_lint.py b/src/antsibull_build/build_data_lint.py similarity index 100% rename from src/antsibull/build_data_lint.py rename to src/antsibull_build/build_data_lint.py diff --git a/src/antsibull/changelog.py b/src/antsibull_build/changelog.py similarity index 100% rename from src/antsibull/changelog.py rename to src/antsibull_build/changelog.py diff --git a/src/antsibull/cli/__init__.py b/src/antsibull_build/cli/__init__.py similarity index 100% rename from src/antsibull/cli/__init__.py rename to src/antsibull_build/cli/__init__.py diff --git a/src/antsibull/cli/antsibull_build.py b/src/antsibull_build/cli/antsibull_build.py similarity index 99% rename from src/antsibull/cli/antsibull_build.py rename to src/antsibull_build/cli/antsibull_build.py index 7633c34f..9947b85b 100644 --- a/src/antsibull/cli/antsibull_build.py +++ b/src/antsibull_build/cli/antsibull_build.py @@ -422,7 +422,8 @@ def parse_args(program_name: str, args: list[str]) -> argparse.Namespace: ) # Delay import to avoid potential import loops - from antsibull import __version__ as _ver # pylint: disable=import-outside-toplevel + # pylint: disable-next=import-outside-toplevel + from antsibull_build import __version__ as _ver parser = get_toplevel_parser( prog=program_name, diff --git a/src/antsibull/constants.py b/src/antsibull_build/constants.py similarity index 100% rename from src/antsibull/constants.py rename to src/antsibull_build/constants.py diff --git a/src/antsibull/data/README_md.txt b/src/antsibull_build/data/README_md.txt similarity index 100% rename from src/antsibull/data/README_md.txt rename to src/antsibull_build/data/README_md.txt diff --git a/src/antsibull/data/README_md.txt.license b/src/antsibull_build/data/README_md.txt.license similarity index 100% rename from src/antsibull/data/README_md.txt.license rename to src/antsibull_build/data/README_md.txt.license diff --git a/src/antsibull/data/__init__.py b/src/antsibull_build/data/__init__.py similarity index 100% rename from src/antsibull/data/__init__.py rename to src/antsibull_build/data/__init__.py diff --git a/src/antsibull/data/ansible-community.py.j2 b/src/antsibull_build/data/ansible-community.py.j2 similarity index 100% rename from src/antsibull/data/ansible-community.py.j2 rename to src/antsibull_build/data/ansible-community.py.j2 diff --git a/src/antsibull/data/ansible-forum-announcement.j2 b/src/antsibull_build/data/ansible-forum-announcement.j2 similarity index 100% rename from src/antsibull/data/ansible-forum-announcement.j2 rename to src/antsibull_build/data/ansible-forum-announcement.j2 diff --git a/src/antsibull/data/ansible-matrix-announcement.j2 b/src/antsibull_build/data/ansible-matrix-announcement.j2 similarity index 100% rename from src/antsibull/data/ansible-matrix-announcement.j2 rename to src/antsibull_build/data/ansible-matrix-announcement.j2 diff --git a/src/antsibull/data/ansible-readme.rst b/src/antsibull_build/data/ansible-readme.rst similarity index 100% rename from src/antsibull/data/ansible-readme.rst rename to src/antsibull_build/data/ansible-readme.rst diff --git a/src/antsibull/data/ansible-release_py.j2 b/src/antsibull_build/data/ansible-release_py.j2 similarity index 100% rename from src/antsibull/data/ansible-release_py.j2 rename to src/antsibull_build/data/ansible-release_py.j2 diff --git a/src/antsibull/data/ansible-setup_py.j2 b/src/antsibull_build/data/ansible-setup_py.j2 similarity index 100% rename from src/antsibull/data/ansible-setup_py.j2 rename to src/antsibull_build/data/ansible-setup_py.j2 diff --git a/src/antsibull/data/ansible-stub-setup.py b/src/antsibull_build/data/ansible-stub-setup.py similarity index 100% rename from src/antsibull/data/ansible-stub-setup.py rename to src/antsibull_build/data/ansible-stub-setup.py diff --git a/src/antsibull/data/build-ansible.sh.j2 b/src/antsibull_build/data/build-ansible.sh.j2 similarity index 100% rename from src/antsibull/data/build-ansible.sh.j2 rename to src/antsibull_build/data/build-ansible.sh.j2 diff --git a/src/antsibull/data/collection-readme.j2 b/src/antsibull_build/data/collection-readme.j2 similarity index 100% rename from src/antsibull/data/collection-readme.j2 rename to src/antsibull_build/data/collection-readme.j2 diff --git a/src/antsibull/data/collection-setup_py.j2 b/src/antsibull_build/data/collection-setup_py.j2 similarity index 100% rename from src/antsibull/data/collection-setup_py.j2 rename to src/antsibull_build/data/collection-setup_py.j2 diff --git a/src/antsibull/data/debian/changelog.j2 b/src/antsibull_build/data/debian/changelog.j2 similarity index 100% rename from src/antsibull/data/debian/changelog.j2 rename to src/antsibull_build/data/debian/changelog.j2 diff --git a/src/antsibull/data/debian/control.j2 b/src/antsibull_build/data/debian/control.j2 similarity index 100% rename from src/antsibull/data/debian/control.j2 rename to src/antsibull_build/data/debian/control.j2 diff --git a/src/antsibull/data/debian/copyright b/src/antsibull_build/data/debian/copyright similarity index 100% rename from src/antsibull/data/debian/copyright rename to src/antsibull_build/data/debian/copyright diff --git a/src/antsibull/data/debian/copyright.license b/src/antsibull_build/data/debian/copyright.license similarity index 100% rename from src/antsibull/data/debian/copyright.license rename to src/antsibull_build/data/debian/copyright.license diff --git a/src/antsibull/data/debian/rules b/src/antsibull_build/data/debian/rules similarity index 100% rename from src/antsibull/data/debian/rules rename to src/antsibull_build/data/debian/rules diff --git a/src/antsibull/data/debian/rules.license b/src/antsibull_build/data/debian/rules.license similarity index 100% rename from src/antsibull/data/debian/rules.license rename to src/antsibull_build/data/debian/rules.license diff --git a/src/antsibull/data/galaxy_yml.j2 b/src/antsibull_build/data/galaxy_yml.j2 similarity index 100% rename from src/antsibull/data/galaxy_yml.j2 rename to src/antsibull_build/data/galaxy_yml.j2 diff --git a/src/antsibull/data/gplv3.txt b/src/antsibull_build/data/gplv3.txt similarity index 100% rename from src/antsibull/data/gplv3.txt rename to src/antsibull_build/data/gplv3.txt diff --git a/src/antsibull/data/gplv3.txt.license b/src/antsibull_build/data/gplv3.txt.license similarity index 100% rename from src/antsibull/data/gplv3.txt.license rename to src/antsibull_build/data/gplv3.txt.license diff --git a/src/antsibull/data/pyproject.toml b/src/antsibull_build/data/pyproject.toml similarity index 100% rename from src/antsibull/data/pyproject.toml rename to src/antsibull_build/data/pyproject.toml diff --git a/src/antsibull/dep_closure.py b/src/antsibull_build/dep_closure.py similarity index 100% rename from src/antsibull/dep_closure.py rename to src/antsibull_build/dep_closure.py diff --git a/src/antsibull/from_source/__init__.py b/src/antsibull_build/from_source/__init__.py similarity index 100% rename from src/antsibull/from_source/__init__.py rename to src/antsibull_build/from_source/__init__.py diff --git a/src/antsibull/from_source/_utils.py b/src/antsibull_build/from_source/_utils.py similarity index 91% rename from src/antsibull/from_source/_utils.py rename to src/antsibull_build/from_source/_utils.py index f332d370..a48d1af6 100644 --- a/src/antsibull/from_source/_utils.py +++ b/src/antsibull_build/from_source/_utils.py @@ -15,8 +15,8 @@ from semantic_version import Version as SemVer -from antsibull.tagging import CollectionTagData -from antsibull.types import CollectionName +from antsibull_build.tagging import CollectionTagData +from antsibull_build.types import CollectionName def filter_tag_data( diff --git a/src/antsibull/from_source/clone.py b/src/antsibull_build/from_source/clone.py similarity index 95% rename from src/antsibull/from_source/clone.py rename to src/antsibull_build/from_source/clone.py index f399f03d..fbfb3dbc 100644 --- a/src/antsibull/from_source/clone.py +++ b/src/antsibull_build/from_source/clone.py @@ -20,9 +20,9 @@ from antsibull_core.subprocess_util import async_log_run from antsibull_fileutils.yaml import load_yaml_file, store_yaml_file -from antsibull.tagging import CollectionTagData -from antsibull.types import CollectionName -from antsibull.utils.paths import copytree_and_symlinks +from antsibull_build.tagging import CollectionTagData +from antsibull_build.types import CollectionName +from antsibull_build.utils.paths import copytree_and_symlinks from .exceptions import CloneError from .verify import FileError, FileErrorOutput @@ -45,7 +45,7 @@ async def clone_collection( Args: tag_data: - A tag dictionary. See `antsibull.tagging.get_collections_tags()`. + A tag dictionary. See `antsibull_build.tagging.get_collections_tags()`. Returns: The path to the collection checkout """ @@ -156,7 +156,7 @@ async def normalize_clone( expected_collection: Expected NAMESPACE.NAME of the collection tag_data: - A tag dictionary. See `antsibull.tagging.get_collections_tags()`. + A tag dictionary. See `antsibull_build.tagging.get_collections_tags()`. """ flog = mlog.fields(func="normalize_clone", collection=collection) errors: list[FileErrorOutput] = [] diff --git a/src/antsibull/from_source/commands.py b/src/antsibull_build/from_source/commands.py similarity index 95% rename from src/antsibull/from_source/commands.py rename to src/antsibull_build/from_source/commands.py index d826c2fe..b5e2b6b8 100644 --- a/src/antsibull/from_source/commands.py +++ b/src/antsibull_build/from_source/commands.py @@ -20,11 +20,11 @@ from antsibull_core.subprocess_util import async_log_run from antsibull_fileutils.yaml import load_yaml_file, store_yaml_file -from antsibull.build_ansible_commands import download_collections -from antsibull.tagging import CollectionTagData -from antsibull.types import CollectionName, make_collection_mapping -from antsibull.utils.galaxy import create_galaxy_context -from antsibull.utils.paths import atemp_or_dir +from antsibull_build.build_ansible_commands import download_collections +from antsibull_build.tagging import CollectionTagData +from antsibull_build.types import CollectionName, make_collection_mapping +from antsibull_build.utils.galaxy import create_galaxy_context +from antsibull_build.utils.paths import atemp_or_dir from ._utils import filter_tag_data, tag_data_as_version_mapping from .clone import NormalizedCheckout, clone_collection, normalize_clone diff --git a/src/antsibull/from_source/exceptions.py b/src/antsibull_build/from_source/exceptions.py similarity index 100% rename from src/antsibull/from_source/exceptions.py rename to src/antsibull_build/from_source/exceptions.py diff --git a/src/antsibull/from_source/verify.py b/src/antsibull_build/from_source/verify.py similarity index 98% rename from src/antsibull/from_source/verify.py rename to src/antsibull_build/from_source/verify.py index 3b735a01..00f6dca2 100644 --- a/src/antsibull/from_source/verify.py +++ b/src/antsibull_build/from_source/verify.py @@ -18,7 +18,7 @@ from antsibull_core import app_context from antsibull_fileutils.hashing import verify_hash -from antsibull.types import add_yaml_type +from antsibull_build.types import add_yaml_type if TYPE_CHECKING: from typing_extensions import NotRequired diff --git a/src/antsibull/new_ansible.py b/src/antsibull_build/new_ansible.py similarity index 100% rename from src/antsibull/new_ansible.py rename to src/antsibull_build/new_ansible.py diff --git a/src/antsibull/py.typed b/src/antsibull_build/py.typed similarity index 100% rename from src/antsibull/py.typed rename to src/antsibull_build/py.typed diff --git a/src/antsibull/pypi.py b/src/antsibull_build/pypi.py similarity index 100% rename from src/antsibull/pypi.py rename to src/antsibull_build/pypi.py diff --git a/src/antsibull/python_metadata.py b/src/antsibull_build/python_metadata.py similarity index 100% rename from src/antsibull/python_metadata.py rename to src/antsibull_build/python_metadata.py diff --git a/src/antsibull/sanity_tests.py b/src/antsibull_build/sanity_tests.py similarity index 98% rename from src/antsibull/sanity_tests.py rename to src/antsibull_build/sanity_tests.py index 020eda71..84121e1c 100644 --- a/src/antsibull/sanity_tests.py +++ b/src/antsibull_build/sanity_tests.py @@ -28,8 +28,8 @@ from antsibull_fileutils.yaml import store_yaml_file from packaging.version import Version -from antsibull.constants import SANITY_TESTS_BANNED_IGNORES, SANITY_TESTS_DEFAULT -from antsibull.types import CollectionName, add_dataclass_yaml_type +from antsibull_build.constants import SANITY_TESTS_BANNED_IGNORES, SANITY_TESTS_DEFAULT +from antsibull_build.types import CollectionName, add_dataclass_yaml_type if TYPE_CHECKING: from _typeshed import StrPath diff --git a/src/antsibull/tagging.py b/src/antsibull_build/tagging.py similarity index 100% rename from src/antsibull/tagging.py rename to src/antsibull_build/tagging.py diff --git a/src/antsibull/types.py b/src/antsibull_build/types.py similarity index 100% rename from src/antsibull/types.py rename to src/antsibull_build/types.py diff --git a/src/antsibull/utils/__init__.py b/src/antsibull_build/utils/__init__.py similarity index 100% rename from src/antsibull/utils/__init__.py rename to src/antsibull_build/utils/__init__.py diff --git a/src/antsibull/utils/galaxy.py b/src/antsibull_build/utils/galaxy.py similarity index 100% rename from src/antsibull/utils/galaxy.py rename to src/antsibull_build/utils/galaxy.py diff --git a/src/antsibull/utils/get_pkg_data.py b/src/antsibull_build/utils/get_pkg_data.py similarity index 100% rename from src/antsibull/utils/get_pkg_data.py rename to src/antsibull_build/utils/get_pkg_data.py diff --git a/src/antsibull/utils/paths.py b/src/antsibull_build/utils/paths.py similarity index 95% rename from src/antsibull/utils/paths.py rename to src/antsibull_build/utils/paths.py index 83ad9062..85b5c2aa 100644 --- a/src/antsibull/utils/paths.py +++ b/src/antsibull_build/utils/paths.py @@ -18,7 +18,7 @@ import aiofiles.ospath import aiofiles.tempfile -from antsibull._vendor.shutil import copytree_and_symlinks +from antsibull_build._vendor.shutil import copytree_and_symlinks if TYPE_CHECKING: from _typeshed import StrPath diff --git a/src/antsibull/versions.py b/src/antsibull_build/versions.py similarity index 100% rename from src/antsibull/versions.py rename to src/antsibull_build/versions.py diff --git a/tests/test_announcements.py b/tests/test_announcements.py index 291e1580..0cdf9290 100644 --- a/tests/test_announcements.py +++ b/tests/test_announcements.py @@ -12,7 +12,7 @@ import pytest -from antsibull.cli.antsibull_build import run +from antsibull_build.cli.antsibull_build import run ANNOUNCEMENT_TESTS = [ ("7.0.0b1", "announce-7.0.0b1"), diff --git a/tests/test_dummy.py b/tests/test_dummy.py index 6bc94b1a..9a95c769 100644 --- a/tests/test_dummy.py +++ b/tests/test_dummy.py @@ -5,7 +5,7 @@ # This file is here so that pytest won't complain that it cannot find tests. # Remove once we have actual tests. -import antsibull +import antsibull_build def test_dummy(): diff --git a/tests/test_paths.py b/tests/test_paths.py index edb65ca4..76c75dc0 100644 --- a/tests/test_paths.py +++ b/tests/test_paths.py @@ -12,8 +12,8 @@ import pytest -from antsibull._vendor.shutil import _should_symlink -from antsibull.utils.paths import atemp_or_dir, copytree_and_symlinks, temp_or_dir +from antsibull_build._vendor.shutil import _should_symlink +from antsibull_build.utils.paths import atemp_or_dir, copytree_and_symlinks, temp_or_dir @pytest.mark.asyncio diff --git a/tests/test_tagging.py b/tests/test_tagging.py index 7fdf9422..24ce6e42 100644 --- a/tests/test_tagging.py +++ b/tests/test_tagging.py @@ -9,7 +9,7 @@ import pytest from antsibull_core.yaml import load_yaml_file -from antsibull.cli.antsibull_build import run +from antsibull_build.cli.antsibull_build import run @pytest.mark.parametrize( @@ -213,7 +213,9 @@ def test_validate_tags(test_data_path: Path, tmp_path: Path): expected_data_path = test_data_path / name expected_data = load_yaml_file(expected_data_path) output_data_path = tmp_path / name - with patch("antsibull.tagging.get_collections_tags", return_value=expected_data): + with patch( + "antsibull_build.tagging.get_collections_tags", return_value=expected_data + ): ran = run( [ "antsibull-build", diff --git a/tests/test_types.py b/tests/test_types.py index 9bd471e2..048adfc6 100644 --- a/tests/test_types.py +++ b/tests/test_types.py @@ -8,7 +8,7 @@ import pytest -from antsibull.types import CollectionName, make_collection_mapping +from antsibull_build.types import CollectionName, make_collection_mapping def test_collection_name() -> None: diff --git a/tests/test_versions.py b/tests/test_versions.py index 539d10f2..df6a6b84 100644 --- a/tests/test_versions.py +++ b/tests/test_versions.py @@ -5,7 +5,7 @@ import pytest -from antsibull.build_ansible_commands import feature_freeze_version +from antsibull_build.build_ansible_commands import feature_freeze_version @pytest.mark.parametrize( diff --git a/tests/verify_package_files.py b/tests/verify_package_files.py index b4660b53..4d2971b8 100644 --- a/tests/verify_package_files.py +++ b/tests/verify_package_files.py @@ -24,10 +24,10 @@ import aiohttp from packaging.version import Version as PypiVer -import antsibull.build_ansible_commands -from antsibull.cli import antsibull_build -from antsibull.constants import MINIMUM_ANSIBLE_VERSIONS -from antsibull.utils.paths import temp_or_dir +import antsibull_build.build_ansible_commands +from antsibull_build.cli import antsibull_build +from antsibull_build.constants import MINIMUM_ANSIBLE_VERSIONS +from antsibull_build.utils.paths import temp_or_dir HERE = Path(__file__).resolve().parent ROOT = HERE.parent @@ -161,7 +161,7 @@ def generate_package_files( cm, cm2, patch_object( - antsibull.build_ansible_commands, + antsibull_build.build_ansible_commands, "antsibull_version", PLACEHOLDER_ANTSIBULL_VERSION, ),