Merge branch 'master' into core-updates

gnu: Add python-drmaa.

* gnu/packages/python.scm (python-drmaa, python2-drmaa): New variables.

gnu: Add python-singledispatch.

* gnu/packages/python.scm (python-singledispatch, python2-singledispatch): New
  variables.

gnu: python-requests: Fix Python 2 version and add support for Python 3.

* gnu/packages/python.scm (python-requests): New variable.
  (python2-requests): Generate based on Python 3 variant.

Merge branch 'master' into core-updates

gnu: Add python-networkx.

* gnu/packages/python.scm (python-networkx, python2-networkx): New variables.

gnu: Add python-decorator.

* gnu/packages/python.scm (python-decorator, python2-decorator): New
  variables.

Merge branch 'master' into core-updates

gnu: python: Do not use patchelf.

* gnu/packages/python.scm (python-2): Add rpath for lib directory of output to
  LDFLAGS.  Remove 'patchelf' from inputs.  Remove #:modules and
  #:imported-modules from arguments.  Remove 'add-lib-to-runpath' phase.
  (python): Do not add #:modules to inherited package arguments.

gnu: Add python-h5py and python2-h5py.

* gnu/packages/python.scm (python-h5py, python2-h5py): New variables.

Merge branch 'master' into core-updates

gnu: Add python2-xlib.

* gnu/packages/python.scm (python2-xlib): New variable.

gnu: Update packages to use 'non-copyleft' instead of 'bsd-style'.

* gnu/packages/avr.scm, gnu/packages/compression.scm,
  gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm,
  gnu/packages/databases.scm, gnu/packages/firmware.scm,
  gnu/packages/flex.scm, gnu/packages/fontutils.scm,
  gnu/packages/gd.scm, gnu/packages/ghostscript.scm,
  gnu/packages/gnunet.scm, gnu/packages/graphics.scm,
  gnu/packages/hugs.scm, gnu/packages/image.scm,
  gnu/packages/linux.scm, gnu/packages/mail.scm,
  gnu/packages/maths.scm, gnu/packages/mit-krb5.scm,
  gnu/packages/python.scm, gnu/packages/rdf.scm,
  gnu/packages/ssh.scm, gnu/packages/tcl.scm,
  gnu/packages/xdisorg.scm, gnu/packages/xiph.scm,
  gnu/packages/yasm.scm, gnu/packages/zip.scm: Use 'non-copyleft'
  instead of 'bsd-style'.

gnu: python-testlib: Fix license field.

Fixes a problem introduced in a1920bc9f25210b2.
Debugged by David Thompson.

* gnu/packages/python.scm (python-testlib)[license]: 'expat' ->
  'license:expat'.

gnu: Add python-testlib and python2-testlib.

* gnu/packages/python.scm (python-testlib, python2-testlib): New variables.

gnu: python2-pil: Adapt to newer Freetype.

* gnu/packages/python.scm (python2-pil): Add snippet.

gnu: Move 'which' to (gnu packages base).

* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
  gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
  gnu/packages/compression.scm, gnu/packages/datamash.scm,
  gnu/packages/games.scm, gnu/packages/glib.scm,
  gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
  gnu/packages/gps.scm, gnu/packages/guile.scm,
  gnu/packages/java.scm, gnu/packages/libevent.scm,
  gnu/packages/linux.scm, gnu/packages/lisp.scm,
  gnu/packages/node.scm, gnu/packages/ntp.scm,
  gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
  gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
  gnu/packages/scheme.scm, gnu/packages/ssh.scm,
  gnu/packages/statistics.scm, gnu/packages/texlive.scm,
  gnu/packages/wdiff.scm: Adjust accordingly.

Merge branch 'core-updates'.

gnu: Add snakemake.

* gnu/packages/python.scm (snakemake): New variable.

gnu: Add Scikit-learn.

* gnu/packages/python.scm (python-scikit-learn, python2-scikit-learn): New
  variables.