Rename bcond check to tests and add platform_python tests
Bcond check was renamed to tests to unify it with other spec files.
This commit is contained in:
		
							parent
							
								
									5673c1a858
								
							
						
					
					
						commit
						f404b22686
					
				| @ -2,7 +2,7 @@ | |||||||
| 
 | 
 | ||||||
| # Bootstrapping does not affect the platform-python-setuptools subpackage | # Bootstrapping does not affect the platform-python-setuptools subpackage | ||||||
| %bcond_with bootstrap | %bcond_with bootstrap | ||||||
| %bcond_without check | %bcond_with tests | ||||||
| 
 | 
 | ||||||
| %bcond_without python2 | %bcond_without python2 | ||||||
| %bcond_without python3 | %bcond_without python3 | ||||||
| @ -50,19 +50,19 @@ BuildRequires:  python2-devel | |||||||
| BuildRequires:  python2-pip | BuildRequires:  python2-pip | ||||||
| BuildRequires:  python2-wheel | BuildRequires:  python2-wheel | ||||||
| %endif # without bootstrap | %endif # without bootstrap | ||||||
| %if %{with check} | %if %{with test} | ||||||
| BuildRequires:  python2-pytest | BuildRequires:  python2-pytest | ||||||
| BuildRequires:  python2-mock | BuildRequires:  python2-mock | ||||||
| BuildRequires:  python2-backports-unittest_mock | BuildRequires:  python2-backports-unittest_mock | ||||||
| %endif # with check | %endif # with tests | ||||||
| %endif # with python2 | %endif # with python2 | ||||||
| 
 | 
 | ||||||
| %if %{with python3} | %if %{with python3} | ||||||
| BuildRequires:  python3-devel | BuildRequires:  python3-devel | ||||||
| %if %{with check} | %if %{with tests} | ||||||
| BuildRequires:  python3-pytest | BuildRequires:  python3-pytest | ||||||
| BuildRequires:  python3-mock | BuildRequires:  python3-mock | ||||||
| %endif # with check | %endif # with tests | ||||||
| %if %{without bootstrap} | %if %{without bootstrap} | ||||||
| BuildRequires:  python3-pip | BuildRequires:  python3-pip | ||||||
| BuildRequires:  python3-wheel | BuildRequires:  python3-wheel | ||||||
| @ -72,9 +72,9 @@ BuildRequires:  python3-wheel | |||||||
| %if %{with platform_python} | %if %{with platform_python} | ||||||
| BuildRequires:  platform-python-devel | BuildRequires:  platform-python-devel | ||||||
| BuildRequires:  platform-python-libs-devel | BuildRequires:  platform-python-libs-devel | ||||||
| %if 0%{?with_check} | %if %{with tests} | ||||||
| BuildRequires:  platform-python-pytest | BuildRequires:  platform-python-pytest | ||||||
| %endif # with_check | %endif # with tests | ||||||
| %endif # with platform_python | %endif # with platform_python | ||||||
| 
 | 
 | ||||||
| # We're now back to setuptools as the package. | # We're now back to setuptools as the package. | ||||||
| @ -246,7 +246,7 @@ find %{buildroot}%{python2_sitelib} -name '*.exe' | xargs rm -f | |||||||
| rm -r docs/{Makefile,conf.py,_*} | rm -r docs/{Makefile,conf.py,_*} | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| %if %{with check} | %if %{with tests} | ||||||
| %check | %check | ||||||
| %if %{with python2} | %if %{with python2} | ||||||
| #LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test | #LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test | ||||||
| @ -255,7 +255,11 @@ rm -r docs/{Makefile,conf.py,_*} | |||||||
| %if %{with python3} | %if %{with python3} | ||||||
| LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} | LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} | ||||||
| %endif # with python3 | %endif # with python3 | ||||||
| %endif # with check | 
 | ||||||
|  | %if %{with platform_python} | ||||||
|  | LANG=en_US.utf8 PYTHONPATH=$(pwd) %{__platform_python} -m pytest | ||||||
|  | %endif # with platform_python | ||||||
|  | %endif # with tests | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| %if %{with python2} | %if %{with python2} | ||||||
| @ -292,6 +296,7 @@ LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} | |||||||
| %changelog | %changelog | ||||||
| * Wed Aug 09 2017 Tomas Orsava <torsava@redhat.com> - 36.2.0-6 | * Wed Aug 09 2017 Tomas Orsava <torsava@redhat.com> - 36.2.0-6 | ||||||
| - Add the platform-python subpackage | - Add the platform-python subpackage | ||||||
|  | - Disable tests so platform-python stack can be bootstrapped | ||||||
|   (https://fedoraproject.org/wiki/Changes/Platform_Python_Stack) |   (https://fedoraproject.org/wiki/Changes/Platform_Python_Stack) | ||||||
| 
 | 
 | ||||||
| * Wed Aug 09 2017 Tomas Orsava <torsava@redhat.com> - 36.2.0-5 | * Wed Aug 09 2017 Tomas Orsava <torsava@redhat.com> - 36.2.0-5 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user