#6 Make test runner use python3 with python3 tests
Merged 6 years ago by kevin. Opened 6 years ago by churchyard.
rpms/ churchyard/ansible nopy2_2  into  master

file modified
+9 -1
@@ -69,8 +69,10 @@ 

  

  # For building docs/tests

  BuildRequires: git-core

+ %if %with_docs

  BuildRequires: python-sphinx

  BuildRequires: asciidoc

+ %endif

  

  # For tests

  # We don't run tests on epel6, so don't bother pulling these in there.
@@ -184,9 +186,11 @@ 

  

  # For Docs/tests

  BuildRequires: git-core

+ %if %with_docs

  BuildRequires: python3-sphinx

  BuildRequires: python3-sphinx-theme-alabaster

  BuildRequires: asciidoc

+ %endif

  # accelerate is the only thing that makes keyczar mandatory.  Since accelerate

  # is deprecated, just ignore it

  #BuildRequires: python-keyczar
@@ -275,7 +279,7 @@ 

  %if (0%{?fedora} == 26)

   make PYTHON=/usr/bin/python2 webdocs

  %else

-  pathfix.py -i %{__python3} -p docs/bin

+  pathfix.py -i %{__python3} -p docs/bin test/runner

   make PYTHON=/usr/bin/python3 webdocs

  %endif

  %endif
@@ -346,6 +350,10 @@ 

  %if 0%{?with_python3}

  pushd %{py3dir}

  ln -s /usr/bin/pytest-3 bin/pytest

+ # Fedora 26 does not have pathfix ¯\_(ツ)_/¯

+ %if (0%{?fedora} > 26)

+  pathfix.py -i %{__python3} -p test/runner

+ %endif

  make PYTHON=/usr/bin/python3 tests-py3

  popd

  %endif  # python3

no initial comment

1 new commit added

  • Use python3 test/runner within python3 docs
6 years ago

Looks all reasonable. Thanks.

Pull-Request has been merged by kevin

6 years ago