Fix package name in rebuild script (#636)

* Fix package name in rebuild script. * Update changelog. Co-authored-by: Maxwell G <maxwell@gtmx.me> --------- Co-authored-by: Maxwell G <maxwell@gtmx.me>
ansible-community · Oct 18, 2024 · 98e2cd0 · 98e2cd0
1 parent 5f6ebd2
commit 98e2cd0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/changelogs/fragments/636-rename.yml b/changelogs/fragments/636-rename.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "Adjust the rebuild script included in Ansible releases to install antsibull-build instead of antsibull (https://github.com/ansible-community/antsibull-build/pull/636)."
diff --git a/src/antsibull_build/data/build-ansible.sh.j2 b/src/antsibull_build/data/build-ansible.sh.j2
@@ -15,7 +15,7 @@ MAJOR="{{ version.major }}"
 # For idempotency, remove build data or built output first
 rm -rf ansible-build-data built
 
-pip3 install --user --upgrade "antsibull=={{ antsibull_version }}"
+pip3 install --user --upgrade "antsibull-build=={{ antsibull_version }}"
 git clone https://github.com/ansible-community/ansible-build-data.git
 mkdir -p built collection-cache
 

diff --git a/tests/test_data/package-files/7.5.0/build-ansible.sh b/tests/test_data/package-files/7.5.0/build-ansible.sh
@@ -11,7 +11,7 @@ MAJOR="7"
 # For idempotency, remove build data or built output first
 rm -rf ansible-build-data built
 
-pip3 install --user --upgrade "antsibull==(ANTSIBULL_VERSION)"
+pip3 install --user --upgrade "antsibull-build==(ANTSIBULL_VERSION)"
 git clone https://github.com/ansible-community/ansible-build-data.git
 mkdir -p built collection-cache
 BUILD_DATA_DIR="ansible-build-data/${MAJOR}"

diff --git a/tests/test_data/package-files/8.1.0/build-ansible.sh b/tests/test_data/package-files/8.1.0/build-ansible.sh
@@ -11,7 +11,7 @@ MAJOR="8"
 # For idempotency, remove build data or built output first
 rm -rf ansible-build-data built
 
-pip3 install --user --upgrade "antsibull==(ANTSIBULL_VERSION)"
+pip3 install --user --upgrade "antsibull-build==(ANTSIBULL_VERSION)"
 git clone https://github.com/ansible-community/ansible-build-data.git
 mkdir -p built collection-cache
 BUILD_DATA_DIR="ansible-build-data/${MAJOR}"

diff --git a/tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh b/tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh
@@ -11,7 +11,7 @@ MAJOR="8"
 # For idempotency, remove build data or built output first
 rm -rf ansible-build-data built
 
-pip3 install --user --upgrade "antsibull==(ANTSIBULL_VERSION)"
+pip3 install --user --upgrade "antsibull-build==(ANTSIBULL_VERSION)"
 git clone https://github.com/ansible-community/ansible-build-data.git
 mkdir -p built collection-cache
 BUILD_DATA_DIR="ansible-build-data/${MAJOR}"