#3 Run tests with pytest, clean cruft
Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.
rpms/ churchyard/python-wcwidth tests  into  master

file modified
+10 -29
@@ -1,11 +1,4 @@ 

- %if 0%{?rhel} && 0%{?rhel} <= 7

- %bcond_with python3

- %else

- %bcond_without python3

- %endif

- 

- # Disable tests since tox.ini is not found properly. I'll try to enable them back ASAP

- %bcond_with tests

+ %bcond_without tests

  

  %global pypi_name wcwidth

  
@@ -16,7 +9,7 @@ 

  

  License:        MIT

  URL:            https://github.com/jquast/wcwidth

- Source0:        https://pypi.io/packages/source/w/%{pypi_name}/%{pypi_name}-%{version}.tar.gz

+ Source0:        %pypi_source

  BuildArch:      noarch

   

  %description
@@ -25,73 +18,61 @@ 

  printable width of a string on a Terminal.

  

  %package -n     python2-%{pypi_name}

+ Summary:        %{summary}

  BuildRequires:  python2-devel

  BuildRequires:  python2-setuptools

  %if %{with tests}

- BuildRequires:  python2-tox

- %endif # with tests

- Summary:        Measures number of Terminal column cells of wide-character codes

+ BuildRequires:  python2-pytest

+ %endif

  %{?python_provide:%python_provide python2-%{pypi_name}}

- %{?el6:Provides: python-%{pypi_name}}

  

  %description -n python2-%{pypi_name}

  This API is mainly for Terminal Emulator implementors, or those writing programs

  that expect to interpreted by a terminal emulator and wish to determine the

  printable width of a string on a Terminal.

  

- %if %{with python3}

  %package -n     python3-%{pypi_name}

- Summary:        Measures number of Terminal column cells of wide-character codes

+ Summary:        %{summary}

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

  %if %{with tests}

- BuildRequires:  python3-tox 

- %endif # with tests

+ BuildRequires:  python3-pytest

+ %endif

  %{?python_provide:%python_provide python3-%{pypi_name}}

  

  %description -n python3-%{pypi_name}

  This API is mainly for Terminal Emulator implementors, or those writing programs

  that expect to interpreted by a terminal emulator and wish to determine the

  printable width of a string on a Terminal.

- %endif # with python3

  

  %prep

  %setup -q -n %{pypi_name}-%{version}

  

  %build

  %py2_build

- %if %{with python3}

  %py3_build

- %endif # with python3

  

  %install

  %py2_install

- %if %{with python3}

  %py3_install

- %endif # with python3

  

  %if %{with tests}

  %check

- %{__python2} setup.py test

- %if %{with python3}

- %{__python3} setup.py test

- %endif # with python3

+ %{__python2} -m pytest -v

+ %{__python3} -m pytest -v

  %endif # with tests

  

  %files -n python2-%{pypi_name} 

- %{!?_licensedir:%global license %doc}

  %doc README.rst

  %license LICENSE.txt

  %{python2_sitelib}/%{pypi_name}

  %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info

  

- %if %{with python3}

  %files -n python3-%{pypi_name} 

  %doc README.rst

  %license LICENSE.txt

  %{python3_sitelib}/%{pypi_name}

  %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info

- %endif # with python3

  

  %changelog

  * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-8

no initial comment

Pull-Request has been merged by churchyard

5 years ago