#1 Use Python 3 to build
Merged 4 years ago by tartina. Opened 4 years ago by pviktori.
rpms/ pviktori/aubio py2br  into  master

@@ -4,7 +4,7 @@ 

  +++ b/tests/create_tests_source.py

  @@ -1,4 +1,4 @@

  -#! /usr/bin/env python

- +#!/usr/bin/python2

+ +#!/usr/bin/python3

   

   """ Create a simple stereo file containing a sine tone at 441 Hz, using only

   python's built-in modules. """
@@ -17,7 +17,7 @@ 

   

   b = bld(name='create_tests_source',

  -    rule='python ${SRC} ${TGT}',

- +    rule='python2 ${SRC} ${TGT}',

+ +    rule='python3 ${SRC} ${TGT}',

       source='create_tests_source.py',

       target=test_sound_target)

   # use post() to create the task, keep a reference to it

file modified
+7 -6
@@ -8,7 +8,7 @@ 

  

  Name:           aubio

  Version:        0.4.9

- Release:        4%{?dist}

+ Release:        5%{?dist}

  Summary:        An audio labeling library

  

  License:        GPLv3+
@@ -27,8 +27,6 @@ 

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

  BuildRequires:  txt2man

- # This is needed for waf

- BuildRequires:  python2

  

  %description

  aubio is a library for audio labeling. Its features include
@@ -66,7 +64,7 @@ 

  %build

  %set_build_flags

  

- python2 ./waf configure \

+ %{python3} ./waf configure \

      --prefix="%_prefix" \

      --bindir="%_bindir" \

      --sysconfdir="%_sysconfdir" \
@@ -80,12 +78,12 @@ 

      --enable-jack \

      --enable-samplerate

  

- python2 ./waf build %{_verbose} %{?_smp_mflags}

+ %{python3} ./waf build %{_verbose} %{?_smp_mflags}

  

  %py3_build

  

  %install

- python2 ./waf --destdir=%{buildroot} %{_verbose} install

+ %{python3} ./waf --destdir=%{buildroot} %{_verbose} install

  rm -f %{buildroot}%{_libdir}/*.a

  rm -rf libaubio-doc

  cp -r %{buildroot}%{_docdir}/libaubio-doc libaubio-doc
@@ -116,6 +114,9 @@ 

  %{python3_sitearch}/%{name}*.egg-info

  

  %changelog

+ * Fri Feb 14 2020 Petr Viktorin <pviktori@redhat.com> - 0.4.9-5

+ - Use Python 3 to build

+ 

  * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.9-4

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

  

aubio seems to build fine with Python 3.
Can the build commands be switched?

Pull-Request has been merged by tartina

4 years ago