Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all: remove usage of get_ansible_core_package_name #571

Merged
merged 1 commit into from
Jan 22, 2024
Merged

all: remove usage of get_ansible_core_package_name #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/antsibull/build_ansible_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import aiohttp
import asyncio_pool # type: ignore[import]
from antsibull_core import app_context
from antsibull_core.ansible_core import get_ansible_core, get_ansible_core_package_name
from antsibull_core.ansible_core import get_ansible_core
from antsibull_core.collections import install_together
from antsibull_core.dependency_files import BuildFile, DependencyFileData, DepsFile
from antsibull_core.galaxy import CollectionDownloader, GalaxyContext
Expand Down Expand Up @@ -195,13 +195,14 @@ def write_python_build_files(


def write_debian_directory(
ansible_version: PypiVer, ansible_core_version: PypiVer, package_dir: StrPath
ansible_version: PypiVer,
ansible_core_version: PypiVer, # pylint: disable=unused-argument
package_dir: StrPath,
) -> None:
debian_dir = os.path.join(package_dir, "debian")
if not os.path.isdir(debian_dir):
os.mkdir(debian_dir, mode=0o700)
debian_files = ("changelog.j2", "control.j2", "copyright", "rules")
ansible_core_package_name = get_ansible_core_package_name(ansible_core_version)
for filename in debian_files:
# Don't use os.path.join here, the get_data docs say it should be
# slash-separated.
Expand All @@ -216,7 +217,7 @@ def write_debian_directory(
data = tmpl.render(
version=str(ansible_version),
date=datetime.datetime.utcnow().strftime("%a, %d %b %Y %T +0000"),
ansible_core_package_name=ansible_core_package_name,
ansible_core_package_name="ansible-core",
)

with open(os.path.join(debian_dir, filename), "w", encoding="utf-8") as f:
Expand Down
5 changes: 1 addition & 4 deletions src/antsibull/python_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from pathlib import Path
from typing import Any, Union

from antsibull_core.ansible_core import get_ansible_core_package_name
from antsibull_core.dependency_files import DependencyFileData
from jinja2 import Template
from packaging.version import Version as PypiVer
Expand Down Expand Up @@ -351,9 +350,7 @@ def write(self, file: Path | None = None) -> None:
setup_tmpl = Template(get_antsibull_data("ansible-setup_py.j2").decode("utf-8"))
setup_contents = setup_tmpl.render(
version=self.maker.ansible_version,
ansible_core_package_name=get_ansible_core_package_name(
self.maker.ansible_core_version
),
ansible_core_package_name="ansible-core",
ansible_core_version=self.maker.ansible_core_version,
collection_deps="",
# not PACKAGE_DATA_NEW_METHOD
Expand Down