launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:py3-metadata-mock into launchpad-buildd:master.

Commit message:
Only include mock in tests_require for Python 2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/383472

On Python 3 we use the standard library's unittest.mock instead.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:py3-metadata-mock into launchpad-buildd:master.

diff --git a/debian/changelog b/debian/changelog
index 1995088..e9c3c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ launchpad-buildd (190) UNRELEASED; urgency=medium
   * Treat build logs as binary files.
   * Treat build output files as binary files.
   * Treat intltool-related files as binary files.
+  * Only include mock in tests_require for Python 2.
 
  -- Colin Watson <cjwatson@xxxxxxxxxx>  Tue, 28 Apr 2020 10:19:27 +0100
 
diff --git a/setup.py b/setup.py
index 3cf5c7b..82ae655 100755
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ setup(
     test_suite='lpbuildd',
     tests_require=[
         'fixtures',
-        'mock',
+        'mock; python_version<"3"',
         'responses',
         'systemfixtures',
         'testtools',