From 2060ff308f81e43c86dadc987e15e30d8e8f97c4 Mon Sep 17 00:00:00 2001
From: CBL-Mariner-Bot <75509084+CBL-Mariner-Bot@users.noreply.github.com>
Date: Mon, 13 May 2024 10:14:54 -0700
Subject: [PATCH] [AUTOPATCHER-CORE] Upgrade python-execnet to 2.1.1 none
 (#8897)

Co-authored-by: Osama Esmail <osamaesmail@microsoft.com>
Co-authored-by: osamaesmailmsft <110202916+osamaesmailmsft@users.noreply.github.com>
---
 .../python-execnet.signatures.json            |  6 +-
 SPECS/python-execnet/python-execnet.spec      | 60 +++++++++++++------
 cgmanifest.json                               |  4 +-
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/SPECS/python-execnet/python-execnet.signatures.json b/SPECS/python-execnet/python-execnet.signatures.json
index 496bd61b3b..697afb10f0 100644
--- a/SPECS/python-execnet/python-execnet.signatures.json
+++ b/SPECS/python-execnet/python-execnet.signatures.json
@@ -1,5 +1,5 @@
 {
- "Signatures": {
-  "execnet-1.9.0.tar.gz": "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"
- }
+  "Signatures": {
+    "execnet-2.1.1.tar.gz": "5189b52c6121c24feae288166ab41b32549c7e2348652736540b9e6e7d4e72e3"
+  }
 }
diff --git a/SPECS/python-execnet/python-execnet.spec b/SPECS/python-execnet/python-execnet.spec
index 617c7fdbe8..add0eba45d 100644
--- a/SPECS/python-execnet/python-execnet.spec
+++ b/SPECS/python-execnet/python-execnet.spec
@@ -1,30 +1,37 @@
 %define pkgname execnet
 Summary:        Python execution distributor
 Name:           python-%{pkgname}
-Version:        1.9.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 License:        MIT
 URL:            https://codespeak.net/execnet/
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Source0:        https://pypi.io/packages/source/e/%{pkgname}/%{pkgname}-%{version}.tar.gz
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-setuptools_scm
-BuildRequires:  python3-wheel
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-hatchling
+BuildRequires:  python%{python3_pkgversion}-hatch-vcs
+BuildRequires:  python%{python3_pkgversion}-pathspec
+BuildRequires:  python%{python3_pkgversion}-pluggy
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-setuptools_scm
+BuildRequires:  python%{python3_pkgversion}-sphinx
+BuildRequires:  python%{python3_pkgversion}-trove-classifiers
+BuildRequires:  python%{python3_pkgversion}-wheel
 %if %{with check}
-BuildRequires:  python3-pip
+BuildRequires:  python%{python3_pkgversion}-pip
+BuildRequires:  python%{python3_pkgversion}-pytest
 %endif
 BuildArch:      noarch
 
 %description
 Python execution distributor
 
-%package -n python3-%{pkgname}
+%package -n python%{python3_pkgversion}-%{pkgname}
 Summary:        Python execution distributor
-Requires:       python3
+Requires:       python%{python3_pkgversion}
 
-%description -n python3-%{pkgname}
+%description -n python%{python3_pkgversion}-%{pkgname}
 execnet provides carefully tested means to ad-hoc interact with Python
 interpreters across version, platform and network barriers. It provides
 a minimal and fast API targetting the following uses:
@@ -36,23 +43,38 @@ a minimal and fast API targetting the following uses:
 %prep
 %autosetup -n %{pkgname}-%{version}
 
-%build
-%py3_build
+find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
+   -exec sed -i '1{/^#!/d}' {} \; \
+   -exec chmod u=rw,go=r {} \;
 
+%pyproject_buildrequires -t
+
+%build
+%pyproject_wheel
+make -C doc html PYTHONPATH=$(pwd)/src
+# remove hidden file
+rm doc/_build/html/.buildinfo
+ 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files %{pkgname}
 
 %check
-pip3 install tox
-sed -i "s/pytest$/pytest==7.1.3/" tox.ini
+pip3 install tox iniconfig
+# sed -i "s/pytest$/pytest==7.1.3/" tox.ini
 LANG=en_US.UTF-8 tox -e py%{python3_version_nodots}
 
-%files -n python3-%{pkgname}
-%license LICENSE
-%doc README.rst CHANGELOG.rst
-%{python3_sitelib}/*
+%files -n python%{python3_pkgversion}-%{pkgname} -f %{pyproject_files}
+%doc README.rst
+%doc doc/_build/html
+%license %{python3_sitelib}/%{pkgname}-%{version}.dist-info/licenses/LICENSE
 
 %changelog
+* Wed Apr 24 2024 Osama Esmail <osamaesmail@microsoft.com> - 2.1.1-1
+- Auto-upgrade to 2.1.1
+- Replacing most of the %%py3... with %%pyproject...
+- Redoing %%check section as well
+
 * Wed Oct 26 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.9.0-2
 - Freezing 'pytest' test dependency to version 7.1.3.
 
diff --git a/cgmanifest.json b/cgmanifest.json
index f8a69d9a3a..cc66e7373a 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -22283,8 +22283,8 @@
         "type": "other",
         "other": {
           "name": "python-execnet",
-          "version": "1.9.0",
-          "downloadUrl": "https://pypi.io/packages/source/e/execnet/execnet-1.9.0.tar.gz"
+          "version": "2.1.1",
+          "downloadUrl": "https://pypi.io/packages/source/e/execnet/execnet-2.1.1.tar.gz"
         }
       }
     },