Make python3-mock dependency optional

https://fedoraproject.org/wiki/Changes/RemovePythonMockUsage

Prefer using unittest.mock to a standalone package. The separate
packages should only really be needed on Python 2.7 these days.

The test requirements file is updated to only require mock on old
Python, and the dependency is removed from setup.py to avoid issues
there.

Relates: https://src.fedoraproject.org/rpms/pungi/pull-request/9

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

setup.py

@@ -62,5 +62,5 @@ setup(
         "dogpile.cache",
     ],
     extras_require={':python_version=="2.7"': ["enum34", "lockfile"]},
-    tests_require=["mock", "pytest", "pytest-cov"],
+    tests_require=["pytest", "pytest-cov"],
 )

test-requirements.txt

@@ -1,4 +1,4 @@
-mock
+mock; python_version < '3.3'
 parameterized
 pytest
 pytest-cov

tests/helpers.py

@@ -7,6 +7,9 @@ import shutil
 import tempfile
 from collections import defaultdict
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 from kobo.rpmlib import parse_nvr

tests/test_arch.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import unittest
 

tests/test_arguments.py

@@ -1,3 +1,6 @@
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_buildinstall.py

@@ -6,6 +6,9 @@ try:
 except ImportError:
     import unittest
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 from copy import copy

tests/test_checks.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_compose.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import logging
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_config.py

@@ -7,6 +7,10 @@ except ImportError:
     import unittest
 
 import six
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 from pungi import checks

tests/test_config_validate_script.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
-
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 import six

tests/test_createiso_phase.py

@@ -2,6 +2,10 @@
 
 
 import logging
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 

tests/test_createiso_script.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 from parameterized import parameterized
 

tests/test_createrepophase.py

@@ -8,6 +8,9 @@ except ImportError:
 import glob
 import os
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 

tests/test_extra_files_phase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_extra_isos_phase.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import logging
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 

tests/test_gather_method_deps.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 from pungi.phases.gather.methods import method_deps as deps

tests/test_gather_method_hybrid.py

@@ -2,6 +2,10 @@
 
 from collections import namedtuple
 import copy
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_gather_method_nodeps.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_gather_phase.py

@@ -4,6 +4,9 @@ import copy
 import json
 import os
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_gather_source_module.py

@@ -5,6 +5,9 @@ try:
 except ImportError:
     import unittest
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 

tests/test_image_container_phase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_imagebuildphase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import six

tests/test_imagechecksumphase.py

@@ -4,6 +4,9 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_initphase.py

@@ -5,6 +5,9 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import six

tests/test_iso_wrapper.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import itertools
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 import six

tests/test_koji_wrapper.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import json
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_linker.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import errno
 import os

tests/test_liveimagesphase.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
-
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import six

tests/test_livemediaphase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_media_split.py

@@ -4,6 +4,9 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 from pungi import media_split

tests/test_metadata.py

@@ -1,3 +1,6 @@
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_notifier.py

@@ -2,6 +2,10 @@
 
 from datetime import datetime
 import json
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_osbs_phase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import json
 

tests/test_osbuild_phase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_ostree_installer_phase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_ostree_phase.py

@@ -2,6 +2,10 @@
 
 
 import json
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_ostree_script.py

@@ -4,6 +4,9 @@
 import json
 import os
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 import yaml

tests/test_ostree_utils.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 import os

tests/test_patch_iso.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_phase_base.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_pkgset_common.py

@@ -2,6 +2,9 @@
 
 import os
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 

tests/test_pkgset_pkgsets.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 import six

tests/test_pkgset_source_koji.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import json
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 import re

tests/test_repoclosure_phase.py

@@ -6,6 +6,9 @@ try:
 except ImportError:
     import unittest
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import six
 

tests/test_runroot.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_scm.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 
 try:

tests/test_test_phase.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 

tests/test_unified_isos.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os
 import shutil

tests/test_util.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import argparse
+
+try:
+    from unittest import mock
+except ImportError:
     import mock
 import os