NixOS · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018
diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix
@@ -1,7 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, fake_factory
+, faker
+, python
 }:
 
 buildPythonPackage rec {
@@ -13,7 +14,14 @@ buildPythonPackage rec {
     sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca";
   };
 
-  propagatedBuildInputs = [ fake_factory ];
+  propagatedBuildInputs = [ faker ];
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest
+  '';
 
   meta = with stdenv.lib; {
     description = "A Python package to create factories for complex objects";

diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix
@@ -18,6 +18,10 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ six dateutil ipaddress mock ];
+
+  # fake-factory is depreciated and single test will always fail
+  doCheck = false;
+
   checkPhase = ''
     ${python.interpreter} -m unittest faker.tests
   '';

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
@@ -15,11 +15,11 @@ buildPythonPackage rec {
     sha256 = "8c6df7903c7b4a51f4ac273bc5fec79a249e3220c47b35d1ac1175b41982d772";
   };
 
+  buildInputs = [ pytestrunner ];
   checkInputs = [
     email_validator
     mock
     ukpostcodeparser
-    pytestrunner
     pytest
   ];
 
@@ -29,6 +29,10 @@ buildPythonPackage rec {
     text-unidecode
   ] ++ lib.optional (pythonOlder "3.3") ipaddress;
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest"
+  '';
+
   meta = with lib; {
     description = "A Python library for generating fake user data";
     homepage    = http://faker.rtfd.org;

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
@@ -9,23 +9,22 @@
 , coverage
 , certifi
 , urllib3
-, isPy3k
+, rednose
+, nose-randomly
 }:
 
 buildPythonPackage rec {
   pname = "httpretty";
   version = "0.9.6";
-  doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc";
   };
 
-  checkInputs = [ tornado requests httplib2 sure nose coverage certifi ];
+  checkInputs = [ tornado requests httplib2 sure nose nose-randomly rednose coverage certifi ];
   propagatedBuildInputs = [ urllib3 ];
 
-
   meta = with stdenv.lib; {
     homepage = "https://falcao.it/HTTPretty/";
     description = "HTTP client request mocking tool";

diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Capture stdout, stderr easily.";
     homepage = https://github.com/oinume/iocapture;
-    license = licenses.MIT;
+    license = licenses.mit;
   };
-}
+}
diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "nose-randomly";
+  version = "1.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3";
+  };
+
+  checkInputs = [ numpy ];
+  propagatedBuildInputs = [
+    nose
+  ];
+
+  meta = with lib; {
+    description = "Nose plugin to randomly order tests and control random.seed";
+    homepage = https://github.com/adamchainz/nose-randomly;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
@@ -1,27 +1,21 @@
 {
-  lib, fetchFromGitHub, buildPythonPackage, isPy3k,
+  lib, fetchPypi, buildPythonPackage, isPy3k,
   # runtime dependencies
   pandas, numpy, requests, inflection, python-dateutil, six, more-itertools,
   # test suite dependencies
-  nose, unittest2, flake8, httpretty, mock, factory_boy, jsondate,
+  nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy,
   # additional runtime dependencies are required on Python 2.x
   pyOpenSSL ? null, ndg-httpsclient ? null, pyasn1 ? null
 }:
 
 buildPythonPackage rec {
   pname = "quandl";
-  version = "3.2.1";
-  sha256 = "0vc0pzs2px9yaqkqcmd2m1b2bq1iils8fs0xbl0989hjq791a4jr";
+  version = "3.4.5";
 
-  patches = [ ./allow-requests-v2.18.patch ];
-
-  # Tests do not work with fetchPypi
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = "quandl-python";
-    rev = "refs/tags/v${version}";
-    inherit sha256;
-    fetchSubmodules = true; # Fetching by tag does not work otherwise
+  src = fetchPypi {
+    inherit version;
+    pname = "Quandl";
+    sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys";
   };
 
   doCheck = true;
@@ -32,8 +26,10 @@ buildPythonPackage rec {
     flake8
     httpretty
     mock
-    factory_boy
     jsondate
+    parameterized
+    faker
+    factory_boy
   ];
 
   propagatedBuildInputs = [

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -3060,6 +3060,8 @@ in {
 
   nose-exclude = callPackage ../development/python-modules/nose-exclude { };
 
+  nose-randomly = callPackage ../development/python-modules/nose-randomly { };
+
   nose2 = callPackage ../development/python-modules/nose2 { };
 
   nose-cover3 = callPackage ../development/python-modules/nose-cover3 { };