Subject: Update python-mock to 2.0.0

From: Leo Famulari <[email-masked]>
Date: Sun, 7 May 2017 14:53:55 -0400

While working on <https://hydra.gnu.org/26818>, I tried updating
python-mock to 2.0.0, the latest release.

However, a large number of dependent packages failed to build [0].

Many of the failures happen because python-six is not found; the
ChangeLog distributed with mock 2.0.0 points out that six is used in a
different way with mock 2.0.0.

But, there is a dependency cycle between mock and six! So, we could try
to create "minimal" package variants to bootstrap these packages, or we
could try adding six to the build environments of the failing packages.

What do you think?

[0] These failed to build with python-mock@2:
/gnu/store/03cr4n55nl7yk7q9y77w3vghg3j4z9rr-pybitmessage-0.6.1.drv
/gnu/store/157sd3ccv3v7yv2ff4ar32alix4ivbn6-pbtranscript-tofu-2.2.3.8f5467f.drv
/gnu/store/1djj6drsdfp95dlfyairzhynq0rk76cz-postorius-1.0.3.drv
/gnu/store/1k2cr1kzbdcx5mdwi5wk6gjdnzlq59hh-python2-mpd2-0.5.5.drv
/gnu/store/20hncyk2sj05f2h8q7m5c0li9v3x95sk-python2-sphinx-cloud-sptheme-1.8.0.drv
/gnu/store/23b1zmm9j7akr78nwhk3i1i9gzdszf8y-python2-pykka-1.2.1.drv
/gnu/store/2l4jnbvggnxj2v003jfi93v19dr3d2nj-python2-faker-0.7.9.drv
/gnu/store/2pr940l4zvqfj3p8hqr6cz48y952vlcj-pepr-1.0.9.drv
/gnu/store/35dj7hy1dhgsy793rb69bl262kfwingk-fio-2.19.drv
/gnu/store/3l8bh3c6c13n9qwbqwpxfd0bg8yr0r7k-python2-bcrypt-3.1.0.drv
/gnu/store/44 2j75kh1vlf9mxf24nwm1sdk6jch2sk-sshuttle-0.78.1.drv
/gnu/store/4gi9l1rc2ldl363h3qd5i6fqnin5x5yi-awscli-1.11.63.drv
/gnu/store/4mqhl08hh0rviyykgfqz7y55vjdfmvl5-python-pykka-1.2.1.drv
/gnu/store/4yaqbdvrwnj5qqmyf63j23pnvaylizkm-alot-0.4.drv
/gnu/store/50y8ywndhx5a83sm1dcw5cvd4sc4pj62-python2-ipywidgets-5.2.2.drv
/gnu/store/5i46sfxz9anjp6114c81cwypxcfzl81x-python2-ndg-httpsclient-0.4.2.drv
/gnu/store/5npy61z5bz2vx9yr7f5vc5v1ih2ykbas-python-cachecontrol-0.11.6.drv
/gnu/store/5xbxarzphxbyjls9dsipncwd53x2cb6d-python2-reno-2.0.3.drv
/gnu/store/674h107gf6vd0f6x8k5is6054i3a6k4g-python-swiftclient-2.6.0.drv
/gnu/store/6x9azxnxiw2h3phpyd18l03dziypykag-duplicity-0.7.12.drv
/gnu/store/70jyzfw0h7gp3abzsfvy0prgpfgj0ykj-deeptools-2.1.1.drv
/gnu/store/7g0azfip3xblbk78lykbv5hdd1m3yjc4-python2-acme-0.14.0.drv
/gnu/store/7jbyyh3pqkk9fwypvmygjbis3iblky8j-python2-git-review-1.25.0.drv
/gnu/store/7qgqacx88la4vz19fhfrys94181i06yv-python2-freezegun-0.3.8.drv
/gnu/store/7s8m70cwbrgkclw9h1gwx808ibfjvqhj-python2-natsort-5.0.2.drv
/gnu/store/8iyl4x2c4np6miin3ba2z3gy8xbygqi0-python2-matplotlib-documentation-2.0.0.drv
/gnu/store/8xfydrqgbbivhd8c7b56vazlq2xlqrxg-python2-joblib-0.10.3.drv
/gnu/store/8z7gqw6cqsgdvhy2s1p3wsbdr9232zq8-grit-2.0.2.drv
/gnu/store/94bhp4lq9rlh0f7d0qiy7jm470wvlvyc-python2-django-simple-math-captcha-1.0.7.drv
/gnu/store/9h163crlikj52bifby0605cb0a09bblj-python2-jupyter-console-5.0.0.drv
/gnu/store/9pppxpfv6465w5sss3lwa0aic4zywz61-python-git-review-1.25.0.drv
/gnu/store/9rmlq9f8l9hgm8qw74lq85p5465zz58h-python2-warpedlmm-0.21.drv
/gnu/store/acnbrx4wgzdbxr8ja5spshmlm58gs3c0-clipper-1.1.drv
/gnu/store/apdw03gp2s71hmmarl2p5dy4dbi5di4y-couger-1.8.2.drv
/gnu/store/ar415aryabh7w869zlfxd91zknhnl7sg-notifymuch-0.1-1.9d4aaf5.drv
/gnu/store/b8njlzqcs22jjw775czg9yzddizhj5cj-python2-sphinx-repoze-autointerface-0.8.drv
/gnu/store/bm0js 63ai301ig986c1k14skrjvyfy4p-autojump-22.3.4.drv
/gnu/store/c72m0dvx6f48ab9avib5glyjggkyml33-python-reno-2.0.3.drv
/gnu/store/crqbvzxqqc48r7ggrxv6yvz21zinnvd3-python2-alembic-0.8.10.drv
/gnu/store/d7sp04m2w9974y0aj2gl877fpbjghv57-patches-0.0-1.ef1b8a7.drv
/gnu/store/dsarnw4ac3dj5s46p5ksc3n8wwk24bg2-python2-graphene-0.10.2.drv
/gnu/store/dvwwvizrk3vdys46d6ac53fylg4wmlhh-python-flake8-polyfill-1.0.1.drv
/gnu/store/fbxq9rs76w27qwas4vrzcpyzq9hnpl2d-khal-0.9.5.drv
/gnu/store/g9xcg50kimwf4lk1p8rqbqkpb5kcik9y-ribodiff-0.2.2.drv
/gnu/store/ggxzpfw37s91kwhmkjrp0ryripy73nlq-neomutt-20170428.drv
/gnu/store/gjr9zwv3w0k0x556brxrzz3477sqb7za-obnam-1.21.drv
/gnu/store/h82g3vc6k369alw9mk9pkcrbmqva4g4n-python-django-mailman3-1.0.1.drv
/gnu/sto re/h935y6cflrf0hrj2cmmwsz9fb7hq1p2y-onionshare-0.9.2.drv
/gnu/store/hdddf01v797dbk6j40kh1aaa5xph78i1-git-annex-remote-hubic-0.3.1.drv
/gnu/store/izz4a0xwsnqw4r00a0wajpgk0d823vfc-python2-cysignals-1.1.0.drv
/gnu/store/j2mm1anx1ciy96rhgqi8jym5892rp450-python2-stem-1.5.4.drv
/gnu/store/jakakxr4c9ycwkyrsgni3a8msbkpsb1c-python2-numpy-documentation-1.12.0.drv
/gnu/store/jbfjxxapg3xs1v6s413lw7qc2pmqrwhi-python-mwclient-0.8.4.drv
/gnu/store/jmndclrfcz910d49v8j53r7ykfn5qnds-python2-orator-0.8.2.drv
/gnu/store/kb4rw8rl5i5jfc7zb38919qkj74x6475-python2-sadisplay-0.4.6.drv
/gnu/store/kmad71fhrmg5f57cxazqcn1yshmcp14h-python2-biom-format-2.1.5.drv
/gnu/store/kq7sjy41ks2y8wmx5w3d4iriwwyjagdj-gajim-0.16.7.drv
/gnu/store/kz855bgq370vhc9xrr3wvgk9ag7hj9q1-python2-seaborn-0.7.1.drv
/gnu/store/l9clpf5g4q8wwgp0y3ymiv8cks3iak71-python-pylint-1.6.5.drv
/gnu/store/lskrc29i18bhafl8a5bp5r3r69qicmkb-assword-0.10.drv
/gnu/store/m1v2c5iv3mxrkqzdsi5328js6vhflhqy-python2-mando-0.5.drv
/gnu/store/m42051wrkmmwq2km14fn02c353zai26d-python2-argcomplete-1.7.0.drv
/gnu/store/mhf1az12n72pc27c3cr273795ii3gg3i-python2-discogs-client-2.2.1.drv
/gnu/store/mr66vnh56dqqyp9wqmqib1hrqp19qfhd-sshoot-1.2.5.drv
/gnu/store/myrcldhdl3zmsv1bg9zbcwrk65bdy7qh-sonata-1.7b1.drv
/gnu/store/nfml5hxxgc3rkq2hizczfbkqrq7rvjjv-python-plastid-0.4.6.drv
/gnu/store/nkhwr468wzcjfr97fnl5zbjcllbdlbzp-python2-mwclient-0.8.4.drv
/gnu/store/nvhvj6qaz10bh7zpr7rn3f738i0pv5w2-python2-binaryornot-0.4.0.drv
/gnu/store/nxy1g6sc i1dg6rbk8c81h2qznbk3b36m-beets-1.4.3.drv
/gnu/store/phfnf1fi0czhbp1w4cgjyzhfpp40v06k-eyed3-0.7.10.drv
/gnu/store/ps6gpamqzpvqhyfdkya4qr3mb39x9p9x-python-pygit2-0.25.0.drv
/gnu/store/q03h4ydbbn26f0f50qdgf43m8knfnmhr-enblend-enfuse-4.2.drv
/gnu/store/qphlmm90s08277pgf036cmj2i4p2khbj-notmuch-addrlookup-c-7.drv
/gnu/store/qsf46xfmakz2yfhv4333f3f8r4lc4krh-julia-0.5.1.drv' ,
/gnu/store/r72nk6h4f3k9wqhp396fdvb2vrxivfmc-python2-s3transfer-0.1.10.drv
/gnu/store/s0709xnkdkffshnkcj8axrqw2s5av4ws-python-orator-0.8.2.drv
/gnu/store/sass0dslyysdl62m50icaywmjyqsrjr8-python2-flake8-polyfill-1.0.1.drv
/gnu/store/svxkjv45iszsmcqsd3m074a021ngdmd7-miso-0.5.3.drv
/gnu/store/szkqpzd3y5s21xwq99g49w9lsqmcgw99-python2-cachecontrol-0.11.6.drv
/gnu/store/v42cgb2qsgin4l5pcb3yh2rrv29xxqmx-python-alembic-0.8.10.drv
/gnu/store/w5v8xjv69vmv4n5grzbs83zdrqiyihqa-python-celery-3.1.24.drv
/gnu/store/w8qdwzaar9bpk1rb0bilx8n29rd6lh0g-python2-plastid-0.4.6.drv
/gnu/store/wcrbxhayajykgi5nhsi755qg6wznkcg6-python-rpy2-2.7.6.drv
/gnu/store/xx6ny42yq0viczy07s9grpa6a2412mjy-gourmet-0.17.4.drv
/gnu/store/y34x3b6h0mr749qaja0rrya5w490502c-python2-pygit2-0.25.0.drv
/gnu/store/y6d39k6dia8y8rxdpvc583n9km4681r9-python2-celery-3.1.24.drv
/gnu/store/z3ynfwh5fihj3ywg1skcbn68wm3c5g67-python2-scikit-image-0.11.3.drv
/gnu/stor e/z46hi94pyw1ywd96r0vfiqc065rs5ypz-pyicoteo-2.0.7.drv
/gnu/store/zjkfj7xnxn8cxgki68riyxckyv0xqq80-python-axolotl-0.1.35.drv
/gnu/store/zx3iiv7rbz3i6a4jz2y6ksmzjrv4fk3m-multipath-tools-0.7.1.drv