Fix ptest for python-asn1crypto, python-mako, python-gast, and python-nocasedict (#13780)

rikenm1 · web-flow · commit 12c5a5831a1b · 2025-05-14T09:52:25.000-07:00
diff --git a/SPECS/python-asn1crypto/python-asn1crypto.spec b/SPECS/python-asn1crypto/python-asn1crypto.spec
@@ -1,17 +1,19 @@
 Summary:        A fast, pure Python library for parsing and serializing ASN.1 structures.
 Name:           python-asn1crypto
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          Development/Languages/Python
 URL:            https://github.com/wbond/asn1crypto
 Source0:        https://github.com/wbond/asn1crypto/archive/refs/tags/%{version}.tar.gz#/asn1crypto-%{version}.tar.gz
+Patch0:         remove-import.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %if 0%{?with_check}
 BuildRequires:  python3-pip
+BuildRequires:  python3-pytest
 %endif
 BuildArch:      noarch
 
@@ -26,7 +28,7 @@ Requires:       python3
 A fast, pure Python library for parsing and serializing ASN.1 structures.
 
 %prep
-%autosetup -n asn1crypto-%{version}
+%autosetup -p1 -n asn1crypto-%{version}
 
 %build
 %py3_build
@@ -35,15 +37,17 @@ A fast, pure Python library for parsing and serializing ASN.1 structures.
 %py3_install
 
 %check
-pip3 install tox
-tox -e py%{python3_version_nodots}
+%pytest
 
 %files -n python3-asn1crypto
 %defattr(-,root,root,-)
 %license LICENSE
 %{python3_sitelib}/*
 
 %changelog
+* Tue May 13 2025 Riken Maharjan <rmaharjan@microsoft.com> - 1.5.1-2
+- Fix Ptest and add a patch to replace imp with importlib.util in test
+
 * Wed Apr 13 2022 Olivia Crain <oliviacrain@microsoft.com> - 1.5.1-1
 - Upgrade to latest upstream version
 - Add tests using tox-based runner
diff --git a/SPECS/python-asn1crypto/remove-import.patch b/SPECS/python-asn1crypto/remove-import.patch
@@ -0,0 +1,36 @@
+diff -urN asn1crypto-1.5.1/tests/__init__.py asn1crypto-1.5.1/tests/__init__.py
+--- asn1crypto-1.5.1/tests/__init__.py	2022-03-15 14:45:23.000000000 +0000
++++ asn1crypto-1.5.1/tests/__init__.py	2025-05-07 19:00:39.694821504 +0000
+@@ -1,8 +1,9 @@
+ # coding: utf-8
+ from __future__ import unicode_literals, division, absolute_import, print_function
+ 
+-import imp
+ import os
++import sys
++import importlib.util
+ import unittest
+ 
+ 
+@@ -38,8 +39,19 @@
+         return None
+ 
+     try:
+-        mod_info = imp.find_module(mod_dir, [path])
+-        return imp.load_module(mod, *mod_info)
++        full_mod_path = os.path.join(path, mod_dir, '__init__.py')
++        if not os.path.isfile(full_mod_path):
++            full_mod_path = os.path.join(path, mod_dir + '.py')
++            if not os.path.isfile(full_mod_path):
++                return None
++
++        spec = importlib.util.spec_from_file_location(mod, full_mod_path)
++        if spec is None:
++            return None
++
++        module = importlib.util.module_from_spec(spec)
++        spec.loader.exec_module(module)
++        return module
+     except ImportError:
+         return None
+ 
diff --git a/SPECS/python-gast/python-gast.spec b/SPECS/python-gast/python-gast.spec
@@ -6,7 +6,7 @@ as produced by ast.parse from the standard ast module.}
 Summary:        Python AST that abstracts the underlying Python version
 Name:           python-gast
 Version:        0.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -17,6 +17,9 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-packaging
 BuildRequires:  python3-pip
 BuildRequires:  python3-wheel
+%if 0%{?with_check}
+BuildRequires:  python3-pytest
+%endif
 BuildArch:      noarch
 
 %description %{_description}
@@ -43,15 +46,16 @@ Summary:        %{summary}
 
 
 %check
-pip3 install tox tox-current-env pytest==7.1.3
-%tox
-
+%pytest
 
 %files -n python3-gast -f %{pyproject_files}
 %license LICENSE
 %doc README.rst
 
 %changelog
+* Tue May 13 2025 Riken Maharjan <rmaharjan@microsoft.com> - 0.5.4-2
+- Fix Ptest by using pytest instead of tox.
+
 * Thu Nov 02 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 0.5.4-1
 - Auto-upgrade to 0.5.4 - Azure Linux 3.0 - package upgrades
 
diff --git a/SPECS/python-mako/python-mako.spec b/SPECS/python-mako/python-mako.spec
@@ -2,7 +2,7 @@
 Summary:        Python templating language
 Name:           python-mako
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -13,6 +13,8 @@ BuildArch:      noarch
 
 %if 0%{?with_check}
 BuildRequires:  python3-pip
+BuildRequires:  python3-pytest
+BuildRequires:  python3-markupsafe
 %endif
 
 %description
@@ -47,8 +49,7 @@ many others, including Django templates, Cheetah, Myghty, and Genshi.
 ln -s mako-render %{buildroot}/%{_bindir}/mako-render3
 
 %check
-pip3 install tox
-tox -e py%{python3_version_nodots}
+%pytest
 
 %files -n python3-mako
 %defattr(-,root,root,-)
@@ -58,6 +59,9 @@ tox -e py%{python3_version_nodots}
 %{_bindir}/mako-render3
 
 %changelog
+* Tue May 13 2025 Riken Maharjan <rmaharjan@microsoft.com> - 1.2.4-2
+- Fix Ptest by using pytest instead of tox.
+
 * Fri Oct 27 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.2.4-1
 - Auto-upgrade to 1.2.4 - Azure Linux 3.0 - package upgrades
 
diff --git a/SPECS/python-nocasedict/python-nocasedict.spec b/SPECS/python-nocasedict/python-nocasedict.spec
@@ -3,7 +3,7 @@
 Summary:        Case-insensitive ordered dictionary library for Python
 Name:           python-%{pkgname}
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,6 +15,7 @@ BuildRequires:  python3-six >= %{six_version}
 BuildRequires:  python3-wheel
 %if 0%{?with_check}
 BuildRequires:  python3-pip
+BuildRequires:  python3-pytest
 %endif
 BuildArch:      noarch
 
@@ -40,8 +41,7 @@ rm -rf *.egg-info
 %py3_install
 
 %check
-pip3 install 'tox>=3.27.1,<4.0.0'
-PYTHONPATH=%{buildroot}%{python3_sitelib} tox -e py%{python3_version_nodots}
+%pytest
 
 %files -n python3-%{pkgname}
 %license LICENSE
@@ -50,6 +50,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} tox -e py%{python3_version_nodots}
 %{python3_sitelib}/*.egg-info
 
 %changelog
+* Tue May 13 2025 Riken Maharjan <rmaharjan@microsoft.com> - 2.0.3-2
+- Fix Ptest by using pytest instead of tox.
+
 * Thu Jul 11 2024 Sam Meluch <sammeluch@microsoft.com> - 2.0.3-1
 - Upgrade to 2.0.3
 
