NixOS · Oct 26, 2019 · Oct 27, 2019 · Oct 27, 2019 · Oct 27, 2019 · Oct 27, 2019
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
@@ -15,6 +15,7 @@
 , mock
 , pythonAtLeast
 , isPy3k
+, pytest
 }:
 
 buildPythonPackage rec {
@@ -27,7 +28,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ glibcLocales ];
-  checkInputs = [ nose pyftpdlib mock psutil ];
+  checkInputs = [ nose pyftpdlib mock psutil pytest ];
   propagatedBuildInputs = [ six appdirs pytz ]
     ++ lib.optionals (!isPy3k) [ backports_os ]
     ++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
@@ -37,7 +38,7 @@ buildPythonPackage rec {
   LC_ALL="en_US.utf-8";
 
   checkPhase = ''
-    HOME=$(mktemp -d) nosetests tests []
+    HOME=$(mktemp -d) pytest -k 'not user_data_repr' --ignore=tests/test_opener.py
   '';
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , grpcio
 , googleapis_common_protos
+, pytest
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ grpcio googleapis_common_protos ];
 
+  # non-standard test format, and python3 will load local google folder first
+  # but tests cannot be ran if google folder is removed or moved
+  doCheck = false;
+  checkInputs = [ pytest ];
+
   meta = with stdenv.lib; {
     description = "GRPC library for the google-iam-v1 service";
     homepage = https://github.com/googleapis/googleapis;

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage, fetchPypi
-, numpy, requests, six, pyglet, scipy
+, numpy, requests, six, pyglet, scipy, cloudpickle
 }:
 
 buildPythonPackage rec {
@@ -12,8 +12,13 @@ buildPythonPackage rec {
     sha256 = "18381e13bbd1e2f206a1b88a2af4fb87affd7d06ee7955a6e5e6a79478a9adfc";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pyglet>=1.2.0,<=1.3.2" "pyglet"
+  '';
+
   propagatedBuildInputs = [
-    numpy requests six pyglet scipy
+    numpy requests six pyglet scipy cloudpickle
   ];
 
   # The test needs MuJoCo that is not free library.

diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
@@ -1,6 +1,6 @@
 { buildPythonPackage, fetchPypi, isPy3k
 , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
-, setuptools_scm, jaraco_collections
+, setuptools_scm, jaraco_collections, importlib-metadata
 }:
 
 buildPythonPackage rec {
@@ -19,6 +19,7 @@ buildPythonPackage rec {
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [
     six
+    importlib-metadata
     jaraco_logging
     jaraco_text
     jaraco_stream

diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -7,11 +7,13 @@
 
 buildPythonPackage rec {
   pname = "mozdevice";
-  version = "1.0.1";
+  version = "3.0.5";
+  format = "wheel";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0026241bff3ad10a73fe24eb4f59c1313c94e5950f397b2f6b8cc4e4dfbfdd73";
+    sha256 = "1gpz0y81407pk71p9yzf15kqqk10fcansw8a607488d11m1jn3yf";
+    format = "wheel";
   };
 
   propagatedBuildInputs = [ moznetwork mozprocess ];

diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi
 , requests
 , testfixtures, mock, requests_toolbelt
-, betamax, betamax-serializers, betamax-matchers
+, betamax, betamax-serializers, betamax-matchers, pytest
 }:
 
 buildPythonPackage rec {
@@ -24,8 +24,13 @@ buildPythonPackage rec {
     betamax-serializers
     betamax-matchers
     requests_toolbelt
+    pytest
   ];
 
+  checkPhase = ''
+    pytest
+  '';
+
   meta = with stdenv.lib; {
     description = "Low-level communication layer for PRAW";
     homepage = https://praw.readthedocs.org/;

diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 # Runtime inputs:
 , pyparsing
 # Check inputs:
@@ -12,9 +12,11 @@ buildPythonPackage rec {
   pname = "pyhocon";
   version = "0.3.53";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "29d9b64d0141d202b77c18665dc4fcafc05fd4c1a4b0fd95ca57c8b58c0e6c2d";
+  src = fetchFromGitHub {
+    owner = "chimpler";
+    repo = "pyhocon";
+    rev = version;
+    sha256 = "1lr56piiasnq1aiwli8ldw2wc3xjfck8az991mr5rdbqqsrh9vkv";
   };
 
   propagatedBuildInputs = [ pyparsing ];

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
@@ -35,7 +35,8 @@ buildPythonPackage rec {
 
   prePatch = ''
     substituteInPlace setup.cfg \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
+      --replace "thinc>=7.1.1,<7.2.0" "thinc~=7.0"
   '';
 
   propagatedBuildInputs = [

diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
-, pbr, six, futures, monotonic
+, pbr, six, futures, monotonic, setuptools_scm
 , pytest, sphinx, tornado
 }:
 
@@ -12,17 +12,15 @@ buildPythonPackage rec {
     sha256 = "a4eb168dbf55ed2cae27e7c6b2bd48ab54dabaf294177d998330cf59f294c112";
   };
 
-  nativeBuildInputs = [ pbr ];
+  nativeBuildInputs = [ pbr setuptools_scm ];
   propagatedBuildInputs = [ six ]
     ++ lib.optionals isPy27 [ futures monotonic ];
 
   checkInputs = [ pytest sphinx tornado ];
-  checkPhase = (if isPy27 then ''
+  checkPhase = if isPy27 then ''
     pytest --ignore='tenacity/tests/test_asyncio.py'
   '' else ''
     pytest
-  '') + ''
-    sphinx-build -a -E -W -b doctest doc/source doc/build
   '';
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , click
 , pytest
 , six
@@ -7,6 +7,7 @@
 buildPythonPackage rec {
   pname = "xdis";
   version = "4.0.4";
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rocky";