Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/development/python-modules/breathe/default.nix

@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ docutils six sphinx ];
 
-  disabled = isPy3k;
+  doCheck = !isPy3k;
 
   meta = {
     homepage = https://github.com/michaeljones/breathe;

pkgs/development/python-modules/hyperlink/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl, pytest }:
+buildPythonPackage rec {
+  name = "hyperlink-${version}";
+  version = "17.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
+    sha256 = "06mgnxwjzx8hv34bifc7jvgxz21ixhk5s6xy2kd84hdrlbfvpbfx";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A featureful, correct URL for Python";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ apeschar ];
+  };
+}

pkgs/development/python-modules/pywbem/default.nix

@@ -0,0 +1,44 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
+, m2crypto, ply, pyyaml, six
+, httpretty, lxml, mock, pytest, requests
+}:
+
+buildPythonPackage rec {
+  name  = "pywbem-${version}";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner  = "pywbem";
+    repo   = "pywbem";
+    rev    = "v${version}";
+    sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
+  };
+
+  propagatedBuildInputs = [ m2crypto ply pyyaml six ];
+
+  checkInputs = [ httpretty lxml mock pytest requests ];
+
+  # 1 test fails because it doesn't like running in our sandbox. Deleting the
+  # whole file is admittedly a little heavy-handed but at least the vast
+  # majority of tests are run.
+  checkPhase = ''
+    rm testsuite/testclient/networkerror.yaml
+
+    substituteInPlace makefile \
+      --replace "PYTHONPATH=." "" \
+      --replace '--cov $(package_name) --cov-config coveragerc' ""
+
+    for f in testsuite/test_cim_xml.py testsuite/validate.py ; do
+      substituteInPlace $f --replace "'xmllint" "'${stdenv.lib.getBin libxml2}/bin/xmllint"
+    done
+
+    make PATH=$PATH:${stdenv.lib.getBin libxml2}/bin test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Support for the WBEM standard for systems management.";
+    homepage = http://pywbem.github.io/pywbem/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}