#4 Use python3_pkgversion, specify directory for pytest
Closed 5 years ago by churchyard. Opened 5 years ago by aviso.
rpms/ aviso/python-wcwidth master  into  master

file modified
+14 -10
@@ -4,7 +4,7 @@ 

  

  Name:           python-%{pypi_name}

  Version:        0.1.7

- Release:        8%{?dist}

+ Release:        9%{?dist}

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

  

  License:        MIT
@@ -31,16 +31,16 @@ 

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

  printable width of a string on a Terminal.

  

- %package -n     python3-%{pypi_name}

+ %package -n     python%{python3_pkgversion}-%{pypi_name}

  Summary:        %{summary}

- BuildRequires:  python3-devel

- BuildRequires:  python3-setuptools

+ BuildRequires:  python%{python3_pkgversion}-devel

+ BuildRequires:  python%{python3_pkgversion}-setuptools

  %if %{with tests}

- BuildRequires:  python3-pytest

+ BuildRequires:  python%{python3_pkgversion}-pytest

  %endif

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

+ %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}

  

- %description -n python3-%{pypi_name}

+ %description -n python%{python3_pkgversion}-%{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.
@@ -58,8 +58,8 @@ 

  

  %if %{with tests}

  %check

- %{__python2} -m pytest -v

- %{__python3} -m pytest -v

+ %{__python2} -m pytest -v wcwidth/tests

+ %{__python3} -m pytest -v wcwidth/tests

  %endif # with tests

  

  %files -n python2-%{pypi_name} 
@@ -68,13 +68,17 @@ 

  %{python2_sitelib}/%{pypi_name}

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

  

- %files -n python3-%{pypi_name} 

+ %files -n python%{python3_pkgversion}-%{pypi_name} 

  %doc README.rst

  %license LICENSE.txt

  %{python3_sitelib}/%{pypi_name}

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

  

  %changelog

+ * Sat Nov 05 2018 Avram Lubkin <aviso@rockhopper.net> - 0.1.7-9

+ - Use python3_pkgversion to determine package names

+ - Specify tests directory for pytest

+ 

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

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

  • Use python3_pkgversion to determine package names
  • Specify tests directory for pytest

These changes are generally good for all branches, but also what's required to build python34-wcwidth for el6.
If you don't see any issues, please accept pull request, sync to el6 and build.

Sorry for ignoring this. I somehow missed the notification.

I don't want to maintain this cruft in Fedora branches, sorry.

Can you just open PR to epel branches?

Created pull request for el6 branch

https://src.fedoraproject.org/rpms/python-wcwidth/pull-request/5

Not sure I'll call it cruft. Depends on your philosophy, but I figure unless you need to do anything really involved, the goal should be to maintain the same spec for Fedora and EPEL. That way EPEL packages are more likely to get regular updates.

Depends on the philosophy. The goal is to maintain as simple Fedora spec as possible. EPEL packages should not get regular updates.

Pull-Request has been closed by churchyard

5 years ago