NixOS · Oct 17, 2019 · Oct 17, 2019 · Oct 17, 2019 · Oct 17, 2019 · Oct 17, 2019
diff --git a/pkgs/development/python-modules/azure-cli-telemetry/default.nix b/pkgs/development/python-modules/azure-cli-telemetry/default.nix
@@ -28,10 +28,10 @@ buildPythonPackage rec {
   # Remove overly restrictive version contraints and obsolete namespace setup
   prePatch = ''
     substituteInPlace setup.py \
-      --replace "applicationinsights>=0.11.1,<0.11.8" "applicationinsights" \
-      --replace "portalocker==1.2.1" "portalocker"
+      --replace "applicationinsights>=0.11.1,<0.12" "applicationinsights"
     substituteInPlace setup.cfg \
       --replace "azure-namespace-package = azure-cli-nspkg" ""
+    rm azure_bdist_wheel.py # we'll fix PEP420 namespacing
   '';
 
   # Prevent these __init__'s from violating PEP420, only needed for python2

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,9 +1,10 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
 , google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }:
 
 buildPythonPackage rec {
   pname = "google-api-core";
   version = "1.7.0";
+  disabled = isPy27; # google namespace no longer works on python2
 
   src = fetchPypi {
     inherit pname version;

diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
@@ -1,18 +1,31 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, colorama, coverage, termstyle, unidecode, mock, backports_shutil_get_terminal_size }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, colorama
+, coverage
+, termstyle
+, lxml
+, unidecode
+, mock
+, backports_shutil_get_terminal_size
+}:
 
 buildPythonPackage rec {
   pname = "green";
-  version = "2.13.1";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d";
+    sha256 = "17cfgq0s02p5cjrsvcicqxiq6kflahjsd9pm03f054x7lpvqi5cv";
   };
 
   propagatedBuildInputs = [
-    colorama coverage termstyle unidecode
+    colorama coverage termstyle unidecode lxml
   ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ];
 
+  # let green run it's own test suite
+  checkPhase = ''
+    $out/bin/green green
+  '';
+
   meta = with lib; {
     description = "Python test runner";
     homepage = https://github.com/CleanCut/green;

diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix
@@ -1,13 +1,15 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , six
 , zope_testing
 }:
 
 buildPythonPackage rec {
   pname = "manuel";
   version = "1.10.1";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
@@ -26,6 +26,7 @@
 buildPythonPackage rec {
   pname = "notebook";
   version = "6.0.1";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;

diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchpatch, python, buildPythonPackage, isPy37
-, protobuf, google_apputils, pyext, libcxx
+, protobuf, google_apputils, pyext, libcxx, isPy27
 , disabled, doCheck ? true }:
 
 with stdenv.lib;
 
 buildPythonPackage {
   inherit (protobuf) name src version;
-  inherit disabled doCheck;
+  inherit disabled;
+  doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
 
   NIX_CFLAGS_COMPILE =
     # work around python distutils compiling C++ with $CC

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , python
+, isPy27
 , zope_interface
 , incremental
 , automat
@@ -17,6 +18,7 @@
 buildPythonPackage rec {
   pname = "Twisted";
   version = "19.7.0";
+  disabled = isPy27; # ruamel namespace now conflicts in python27
 
   src = fetchPypi {
     inherit pname version;