Merge master into staging

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

@@ -7,6 +7,8 @@
 , ipython_genutils
 , decorator
 , enum34
+, pythonOlder
+, six
 }:
 
 buildPythonPackage rec {
@@ -20,12 +22,14 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ glibcLocales pytest mock ];
-  propagatedBuildInputs = [ ipython_genutils decorator enum34 ];
+  propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" py.test $out
+    LC_ALL="en_US.UTF-8" py.test
   '';
 
+#   doCheck = false;
+
   meta = {
     description = "Traitlets Python config system";
     homepage = http://ipython.org/;

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

@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "1.9.1";
+  version = "1.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "caa45b7987fc96321258cd7668e3be2ff34064f5c66d2d975b641adca659c1ab";
+    sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g";
   };
 
   propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ];