#2 BR /usr/bin/python
Merged 5 years ago by zbyszek. Opened 5 years ago by churchyard.
rpms/ churchyard/python-sphinxcontrib-programoutput br_python_executable  into  master

@@ -21,6 +21,9 @@ 

  BuildRequires:  python2-sphinx

  BuildRequires:  python2-pytest

  

+ # We call 'python' just for some simple output, so any version is fine.

+ BuildRequires:  /usr/bin/python

+ 

  %if %{with python3}

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools
@@ -89,10 +92,6 @@ 

  %check

  export LC_CTYPE="en_US.utf8"        # without this encoding tests break

  

- # We call 'python' just for some simple output, so any version is fine.

- # Silence the warning.

- export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0

- 

  PYTHONPATH=build/lib/ py.test-%{python2_version} -v build/lib/sphinxcontrib

  %if %{with python3}

  PYTHONPATH=build/lib/ py.test-%{python3_version} -v build/lib/sphinxcontrib

rebased onto c1b298e

5 years ago

Rebased.

cc @zbyszek who appears not to subscribed here for whatever reason

Pull-Request has been merged by zbyszek

5 years ago