python-wheel: upgrade to 0.43.0 (#9083)

Co-authored-by: Betty Lakes <bettylakes@microsoft.com>

SPECS/python-wheel/python-wheel.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "wheel-0.33.6.tar.gz": "ce9b3af862796aeb7af75c72e54fe974e4bb9a95502f49b1da25fdbf4c53e742"
+  "wheel-0.43.0.tar.gz": "23060d7cc8afafc2930554624b4bae7d58031830672048622c926675ab91e3b0"
  }
-}
+}

SPECS/python-wheel/python-wheel.spec

@@ -1,16 +1,17 @@
 # The function of bootstrap is that it disables the wheel subpackage
 %bcond_with bootstrap
+%bcond main_python 1
 Summary:        Built-package format for Python
 Name:           python-%{pypi_name}
-Version:        0.33.6
-Release:        7%{?dist}
+Version:        0.43.0
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
 %global pypi_name wheel
-%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
+%global python_wheel_name %{pypi_name}-%{version}-py3-none-any.whl
 %global python_wheeldir %{_datadir}/python-wheels
 %global _description \
 A built-package format for Python.\
@@ -33,13 +34,14 @@ Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-pip
 %if 0%{?with_check}
 BuildRequires:  python3-atomicwrites
 BuildRequires:  python3-attrs
-BuildRequires:  python3-pip
 BuildRequires:  python3-pytest
 BuildRequires:  python3-six
 %endif
+BuildRequires:  python3-flit-core
 
 %description -n python3-%{pypi_name} %{_description}
 
@@ -53,55 +55,69 @@ Summary:        The Python wheel module packaged as a wheel
 A Python wheel of wheel to use with virtualenv.
 %endif
 
-
 %prep
 %autosetup -n %{pypi_name}-%{version} -p1
 
-# Empty files make rpmlint sad
-test -s wheel/cli/install.py || echo "# empty" > wheel/cli/install.py
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%py3_build
-
-%if %{without bootstrap}
-%{py3_build_wheel}
-%endif
+%global _pyproject_wheeldir dist
+%python3 -m flit_core.wheel
 
+%pyproject_wheel
 
 %install
-%py3_install
-mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
-ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
-ln -s %{pypi_name}-3 %{buildroot}%{_bindir}/%{pypi_name}
-
-%if %{without bootstrap}
-mkdir -p %{buildroot}%{python_wheeldir}
-install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
+# pip is not available when bootstrapping, so we need to unpack the wheel and
+# create the entrypoints manually.
+%if %{with bootstrap}
+mkdir -p %{buildroot}%{python3_sitelib}
+unzip %{_pyproject_wheeldir}/%{python_wheel_name} \
+    -d %{buildroot}%{python3_sitelib} -x wheel-%{version}.dist-info/RECORD
+install -Dpm 0755 %{SOURCE1} %{buildroot}%{_bindir}/wheel
+%py3_shebang_fix %{buildroot}%{_bindir}/wheel
+%else
+%pyproject_install
 %endif
 
+mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
+%if %{with main_python}
+ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
+ln -s %{pypi_name}-3 %{buildroot}%{_bindir}/%{pypi_name}
+%endif
+
+mkdir -p %{buildroot}%{python_wheel_dir}
+install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
 
 %check
-rm setup.cfg
-%{python3} -m pip install pluggy more-itertools
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test3 -v --ignore build
+pip3 install iniconfig
+# Smoke test
+%{py3_test_envvars} wheel-%{python3_version} version
+%py3_check_import wheel
+%pytest -v --ignore build
 
 %files -n python3-%{pypi_name}
 %license LICENSE.txt
 %doc README.rst
-%{_bindir}/%{pypi_name}
-%{_bindir}/%{pypi_name}-3
 %{_bindir}/%{pypi_name}-%{python3_version}
 %{python3_sitelib}/%{pypi_name}*
+%if %{with main_python}
+%{_bindir}/%{pypi_name}
+%{_bindir}/%{pypi_name}-3
+%endif
 
 %if %{without bootstrap}
 %files wheel
 %license LICENSE.txt
 # we own the dir for simplicity
 %dir %{python_wheeldir}/
-%{python_wheeldir}/%{python_wheelname}
+%{python_wheeldir}/%{python_wheel_name}
 %endif
 
 %changelog
+* Fri May 10 2024 Betty Lakes <bettylakes@microsoft.com> - 0.43.0-1
+- Updated to 0.43.0
+
 * Thu Mar 03 2022 Bala <balakumaran.kannan@microsoft.com> - 0.33.6-7
 - BR multiple python3 modules for PTest
 - pip3 install additional modules which not available as RPM

cgmanifest.json

@@ -24883,8 +24883,8 @@
         "type": "other",
         "other": {
           "name": "python-wheel",
-          "version": "0.33.6",
-          "downloadUrl": "https://github.com/pypa/wheel/archive/0.33.6/wheel-0.33.6.tar.gz"
+          "version": "0.43.0",
+          "downloadUrl": "https://github.com/pypa/wheel/archive/0.43.0/wheel-0.43.0.tar.gz"
         }
       }
     },

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -518,7 +518,7 @@ procps-ng-lang-4.0.4-1.azl3.aarch64.rpm
 pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm
 pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm
 python-markupsafe-debuginfo-2.1.3-1.azl3.aarch64.rpm
-python-wheel-wheel-0.33.6-7.azl3.noarch.rpm
+python-wheel-wheel-0.43.0-1.azl3.noarch.rpm
 python3-3.12.0-3.azl3.aarch64.rpm
 python3-audit-3.1.2-1.azl3.aarch64.rpm
 python3-cracklib-2.9.11-1.azl3.aarch64.rpm
@@ -544,7 +544,7 @@ python3-rpm-generators-14-11.azl3.noarch.rpm
 python3-setuptools-69.0.3-2.azl3.noarch.rpm
 python3-test-3.12.0-3.azl3.aarch64.rpm
 python3-tools-3.12.0-3.azl3.aarch64.rpm
-python3-wheel-0.33.6-7.azl3.noarch.rpm
+python3-wheel-0.43.0-1.azl3.noarch.rpm
 readline-8.2-1.azl3.aarch64.rpm
 readline-debuginfo-8.2-1.azl3.aarch64.rpm
 readline-devel-8.2-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -524,7 +524,7 @@ procps-ng-lang-4.0.4-1.azl3.x86_64.rpm
 pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm
 pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm
 python-markupsafe-debuginfo-2.1.3-1.azl3.x86_64.rpm
-python-wheel-wheel-0.33.6-7.azl3.noarch.rpm
+python-wheel-wheel-0.43.0-1.azl3.noarch.rpm
 python3-3.12.0-3.azl3.x86_64.rpm
 python3-audit-3.1.2-1.azl3.x86_64.rpm
 python3-cracklib-2.9.11-1.azl3.x86_64.rpm
@@ -550,7 +550,7 @@ python3-rpm-generators-14-11.azl3.noarch.rpm
 python3-setuptools-69.0.3-2.azl3.noarch.rpm
 python3-test-3.12.0-3.azl3.x86_64.rpm
 python3-tools-3.12.0-3.azl3.x86_64.rpm
-python3-wheel-0.33.6-7.azl3.noarch.rpm
+python3-wheel-0.43.0-1.azl3.noarch.rpm
 readline-8.2-1.azl3.x86_64.rpm
 readline-debuginfo-8.2-1.azl3.x86_64.rpm
 readline-devel-8.2-1.azl3.x86_64.rpm

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

@@ -650,9 +650,9 @@ chroot_and_install_rpms rpm rpm-build-libs
 chroot_and_install_rpms rpm rpm-devel
 chroot_and_install_rpms rpm rpm-build
 
-build_rpm_in_chroot_no_install python-wheel
-build_rpm_in_chroot_no_install python-flit-core
 build_rpm_in_chroot_no_install python-pip
+build_rpm_in_chroot_no_install python-flit-core
+build_rpm_in_chroot_no_install python-wheel
 
 # python-jinja2 needs python3-markupsafe
 # python3-setuptools, python3-libs are also needed but already installed