Remove python 2 support
This commit is contained in:
		
							parent
							
								
									4597bf98f4
								
							
						
					
					
						commit
						7bc135db0a
					
				| @ -1,10 +1,5 @@ | |||||||
| %global srcname lit | %global srcname lit | ||||||
| 
 | 
 | ||||||
| %if 0%{?fedora} || 0%{?rhel} > 7 |  | ||||||
| %global with_python2 0 |  | ||||||
| %else |  | ||||||
| %global with_python2 1 |  | ||||||
| %endif |  | ||||||
| 
 | 
 | ||||||
| %global lit_version 13.0.0 | %global lit_version 13.0.0 | ||||||
| #global rc_ver 1 | #global rc_ver 1 | ||||||
| @ -12,13 +7,9 @@ | |||||||
| 
 | 
 | ||||||
| %bcond_without check | %bcond_without check | ||||||
| 
 | 
 | ||||||
| # FIXME: Work around for rhel not having py2_build/py2_install macro. |  | ||||||
| %{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}} |  | ||||||
| %{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}} |  | ||||||
| 
 |  | ||||||
| Name: python-%{srcname} | Name: python-%{srcname} | ||||||
| Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}} | Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}} | ||||||
| Release: 1%{?dist} | Release: 2%{?dist} | ||||||
| BuildArch: noarch | BuildArch: noarch | ||||||
| 
 | 
 | ||||||
| License: NCSA | License: NCSA | ||||||
| @ -33,10 +24,6 @@ BuildRequires: llvm-test | |||||||
| 
 | 
 | ||||||
| BuildRequires: python3-devel | BuildRequires: python3-devel | ||||||
| BuildRequires: python3-setuptools | BuildRequires: python3-setuptools | ||||||
| %if 0%{?with_python2} |  | ||||||
| BuildRequires: python2-devel |  | ||||||
| BuildRequires: python2-setuptools |  | ||||||
| %endif |  | ||||||
| 
 | 
 | ||||||
| %description | %description | ||||||
| lit is a tool used by the LLVM project for executing its test suites. | lit is a tool used by the LLVM project for executing its test suites. | ||||||
| @ -46,48 +33,24 @@ Summary: LLVM lit test runner for Python 3 | |||||||
| 
 | 
 | ||||||
| Requires: python3-setuptools | Requires: python3-setuptools | ||||||
| 
 | 
 | ||||||
| %if 0%{?with_python2} |  | ||||||
| %package -n python2-lit |  | ||||||
| Summary: LLVM lit test runner for Python 2 |  | ||||||
| 
 |  | ||||||
| Requires: python2-setuptools |  | ||||||
| %endif |  | ||||||
| 
 |  | ||||||
| %description -n python3-lit | %description -n python3-lit | ||||||
| lit is a tool used by the LLVM project for executing its test suites. | lit is a tool used by the LLVM project for executing its test suites. | ||||||
| 
 | 
 | ||||||
| %if 0%{?with_python2} |  | ||||||
| %description -n python2-lit |  | ||||||
| lit is a tool used by the LLVM project for executing its test suites. |  | ||||||
| %endif |  | ||||||
| 
 |  | ||||||
| %prep | %prep | ||||||
| %autosetup -n %{srcname}-%{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} -p4 | %autosetup -n %{srcname}-%{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} -p4 | ||||||
| 
 | 
 | ||||||
| %build | %build | ||||||
| %py3_build | %py3_build | ||||||
| %if 0%{?with_python2} |  | ||||||
| %py2_build |  | ||||||
| %endif |  | ||||||
| 
 | 
 | ||||||
| %install | %install | ||||||
| %py3_install | %py3_install | ||||||
| %if 0%{?with_python2} |  | ||||||
| %py2_install |  | ||||||
| %endif |  | ||||||
| 
 | 
 | ||||||
| # Strip out #!/usr/bin/env python | # Strip out #!/usr/bin/env python | ||||||
| sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/%{srcname}/*.py | sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/%{srcname}/*.py | ||||||
| %if 0%{?with_python2} |  | ||||||
| sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python2_sitelib}/%{srcname}/*.py |  | ||||||
| %endif |  | ||||||
| 
 | 
 | ||||||
| %if %{with check} | %if %{with check} | ||||||
| %check | %check | ||||||
| %{__python3} lit.py tests | %{__python3} lit.py tests | ||||||
| %if 0%{?with_python2} |  | ||||||
| %{__python2} lit.py tests |  | ||||||
| %endif |  | ||||||
| %endif | %endif | ||||||
| 
 | 
 | ||||||
| %files -n python3-%{srcname} | %files -n python3-%{srcname} | ||||||
| @ -96,17 +59,10 @@ sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python2_sitelib}/%{srcna | |||||||
| %{python3_sitelib}/* | %{python3_sitelib}/* | ||||||
| %{_bindir}/lit | %{_bindir}/lit | ||||||
| 
 | 
 | ||||||
| %if 0%{?with_python2} |  | ||||||
| %files -n python2-%{srcname} |  | ||||||
| %license LICENSE.TXT |  | ||||||
| %doc README.txt |  | ||||||
| %{python2_sitelib}/* |  | ||||||
| %if %{undefined with_python2} |  | ||||||
| %{_bindir}/lit |  | ||||||
| %endif |  | ||||||
| %endif |  | ||||||
| 
 |  | ||||||
| %changelog | %changelog | ||||||
|  | * Thu Oct 21 2021 Konrad Kleine <kkleine@redhat.com> - 13.0.0-2 | ||||||
|  | - Remove python 2 support | ||||||
|  | 
 | ||||||
| * Tue Oct 05 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-1 | * Tue Oct 05 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-1 | ||||||
| - 13.0.0 Release | - 13.0.0 Release | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user