diff options
5 files changed, 71 insertions, 21 deletions
diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix new file mode 100644 index 00000000000..a14d1fa920d --- /dev/null +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "backports.entry-points-selectable"; + version = "1.0.3"; + + src = fetchPypi { + inherit version; + # pypi project name and tarball name differ + pname = builtins.replaceStrings [ "-" ] [ "_" ] pname; + sha256 = "f30bcd19c5e2728ac93821d2b6ae0a325597e0ca12324fd91a39fa80e1cd0dd8"; + }; + + format = "pyproject"; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Compatibility shim providing selectable entry points for older implementations"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/jaraco/backports.entry_points_selectable"; + }; +} diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index ce3b3aa1f67..684ab10a271 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04y2bc2yv3q84llxnafqrciqxjqpxbrd8glbnvvr16c20fwc3r4q"; + sha256 = "sha256-e0Mq9AVJEWQ9GEtYFXk2fMIs7GtAUsyJN6XheqAnD3I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index be8d675fc1e..f8e240ca57e 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,26 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, factory_boy, faker, numpy -, pytest, pytest_xdist +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, factory_boy, faker, numpy, backports-entry-points-selectable +, pytestCheckHook, pytest_xdist }: buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.5.0"; + version = "3.6.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "440cec143fd9b0adeb072006c71e0294402a2bc2ccd08079c2341087ba4cf2d1"; + # fetch from GitHub as pypi tarball doesn't include tests + src = fetchFromGitHub { + repo = pname; + owner = "pytest-dev"; + rev = version; + sha256 = "17s7gx8b7sl7mp77f5dxzwbb32qliz9awrp6xz58bhjqp7pcsa5h"; }; - propagatedBuildInputs = [ numpy factory_boy faker ]; + propagatedBuildInputs = [ + backports-entry-points-selectable + ]; - checkInputs = [ pytest pytest_xdist ]; - - # test warnings are fixed on an unreleased version: - # https://github.com/pytest-dev/pytest-randomly/pull/281 - checkPhase = "pytest -p no:randomly"; + checkInputs = [ + pytestCheckHook + pytest_xdist + numpy + factory_boy + faker + ]; + # needs special invocation, copied from tox.ini + pytestFlagsArray = [ "-p" "no:randomly" ]; meta = with lib; { description = "Pytest plugin to randomly order tests and control random.seed"; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index f835509fe9b..a959bef1682 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,12 +1,13 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPy3k , cryptography , futures ? null -, pytest , pyopenssl , service-identity +, pytestCheckHook , idna }: @@ -20,9 +21,9 @@ buildPythonPackage rec { }; checkInputs = [ - pytest pyopenssl service-identity + pytestCheckHook ]; propagatedBuildInputs = [ @@ -32,9 +33,11 @@ buildPythonPackage rec { futures ]; - checkPhase = '' - pytest - ''; + # aarch64-darwin forbids W+X memory, but this tests depends on it: + # * https://github.com/pyca/pyopenssl/issues/873 + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "test_pyopenssl_end_to_end" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6319e430e4e..8d2d1e4f637 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -891,6 +891,8 @@ in { backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; + backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; |