version up: mock 3.0.5, six 1.12.0

This fixes previous commit.

software/neoppod/software-common.cfg

@@ -134,6 +134,7 @@ md5sum = 9f6f8f2b5f4cb0d97d50ffc1d3837e2f
 BTrees = 4.5.1
 ZODB = 4.4.5
 coverage = 4.5.1
+mock = 3.0.5
 ecdsa = 0.13
 gitdb2 = 2.0.0
 msgpack = 0.5.6
@@ -163,3 +164,7 @@ ZEO = 4.3.1+SlapOSPatched001
 # Required by:
 # ZEO==4.3.1
 zdaemon = 4.2.0
+
+# Required by:
+# mock = 3.0.5
+funcsigs = 1.0.2

software/neoppod/software-zodb5.cfg

@@ -8,7 +8,6 @@ ZEO-patches =
 [versions]
 ZODB = 5.5.1
 ZEO = 5.2.0
-mock = 3.0.5
 transaction = 2.4.0
 
 # Required by:

stack/erp5/buildout.cfg

@@ -820,12 +820,6 @@ unidiff = 0.5.5
 jsonpickle = 0.9.6
 decorator = 4.3.0
 
-mock = 3.0.4
-
-# Required by:
-# mock = 3.0.4
-funcsigs = 1.0.2
-
 responses = 0.10.6
 
 # Required by:

stack/slapos.cfg

@@ -135,7 +135,7 @@ pyOpenSSL = 18.0.0
 pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
-six = 1.11.0
+six = 1.12.0
 slapos.cookbook = 1.0.119
 slapos.core = 1.4.26
 slapos.extension.strip = 0.4