Merge pull request #127835 from dotlambda/hypothesis_4-drop

This commit is contained in:
Martin Weinelt 2021-06-23 15:28:49 +02:00 committed by GitHub
commit 65ddaf2db9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View file

@ -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";

View file

@ -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 { };

View file

@ -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 { };