- adjusted mock patch to prefer standalone module or strange py.test failures can...

- more test BRs

diff --git a/sphinx-pdg-mock.patch b/sphinx-pdg-mock.patch
index 50c74dd5362496ca29e5872fba339cab0316022a..302100c459e21626225cf539daacd2bcf715c8d3 100644 (file)
--- a/sphinx-pdg-mock.patch
+++ b/sphinx-pdg-mock.patch
@@ -6,9 +6,9 @@
  from docutils import nodes
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  import pytest
  from textwrap import dedent
  from sphinx.errors import SphinxError
@@ -20,9 +20,9 @@
  import pytest
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  
  import sphinx
  from sphinx.config import Config
@@ -34,9 +34,9 @@
  from docutils import nodes
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  
  from sphinx.domains.std import StandardDomain
  
@@ -48,9 +48,9 @@
  
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  
  Environment = namedtuple('Environment', 'indexentries')
  
@@ -62,9 +62,9 @@
  from docutils import nodes
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  import pytest
  import requests
  from io import BytesIO
@@ -76,9 +76,9 @@
  from sphinx.ext.napoleon.docstring import GoogleDocstring, NumpyDocstring
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  
  
  class NamedtupleSubclass(namedtuple('NamedtupleSubclass', ('attr1', 'attr2'))):
@@ -90,9 +90,9 @@
                                   setup)
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  
  
  def _private_doc():
@@ -104,9 +104,9 @@
  
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  import pytest
  
  from sphinx.theming import Theme, ThemeError
@@ -118,9 +118,9 @@
  
 -import mock
 +try:
-+    from unittest import mock
-+except ImportError:
 +    import mock
++except ImportError:
++    from unittest import mock
  
  
  class DummyTemplateLoader(BuiltinTemplateLoader):

diff --git a/sphinx-pdg.spec b/sphinx-pdg.spec
index c6c74c7dc1de01f6271944ab281118fa4fff6e96..1f743702b2bcaf876e026f78cf1aee856dde97df 100644 (file)
--- a/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@ -35,6 +35,8 @@ BuildRequires:        python-setuptools >= 7.0
 BuildRequires: python-alabaster >= 0.7
 BuildRequires: python-alabaster < 0.8
 BuildRequires: python-docutils >= 0.11
+BuildRequires: python-enum34
+BuildRequires: python-flake8
 BuildRequires: python-html5lib
 BuildRequires: python-imagesize
 BuildRequires: python-jinja2 >= 2.3
@@ -56,6 +58,7 @@ BuildRequires:        python3-setuptools >= 7.0
 BuildRequires: python3-alabaster >= 0.7
 BuildRequires: python3-alabaster < 0.8
 BuildRequires: python3-docutils >= 0.11
+BuildRequires: python3-flake8
 BuildRequires: python3-html5lib
 BuildRequires: python3-imagesize
 BuildRequires: python3-jinja2 >= 2.3