mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
Merge pull request #127835 from dotlambda/hypothesis_4-drop
This commit is contained in:
commit
65ddaf2db9
3 changed files with 9 additions and 9 deletions
|
@ -3,9 +3,8 @@
|
|||
, fetchPypi
|
||||
, isPy27
|
||||
, six
|
||||
, pytest_4
|
||||
, hypothesis_4
|
||||
, pytestrunner
|
||||
, pytestCheckHook
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -21,12 +20,16 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ pytestrunner pytest_4 hypothesis_4 ];
|
||||
checkInputs = [ pytestCheckHook hypothesis ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'pytest<5' 'pytest'
|
||||
substituteInPlace setup.py \
|
||||
--replace 'pytest<5' 'pytest' \
|
||||
--replace 'hypothesis<5' 'hypothesis'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pyrsistent" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tobgu/pyrsistent/";
|
||||
description = "Persistent/Functional/Immutable data structures";
|
||||
|
|
|
@ -3362,9 +3362,6 @@ in {
|
|||
|
||||
hyperopt = callPackage ../development/python-modules/hyperopt { };
|
||||
|
||||
# File name is called 2.nix because this one will need to remain for Python 2.
|
||||
hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { };
|
||||
|
||||
hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { };
|
||||
|
||||
hypothesis = callPackage ../development/python-modules/hypothesis { };
|
||||
|
|
|
@ -168,7 +168,7 @@ with self; with super; {
|
|||
|
||||
http_signature = callPackage ../development/python-modules/http_signature { };
|
||||
|
||||
hypothesis = super.hypothesis_4;
|
||||
hypothesis = callPackage ../development/python-modules/hypothesis/2.nix { };
|
||||
|
||||
idna = callPackage ../development/python-modules/idna/2.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue