diff options
Diffstat (limited to 'pkgs/development/python-modules')
21 files changed, 103 insertions, 26 deletions
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 0fe692c9026..0235c611c61 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -1,10 +1,11 @@ { buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , coveralls , pytestcov , cython , numpy +, python }: buildPythonPackage rec { @@ -16,13 +17,23 @@ buildPythonPackage rec { sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207"; }; - checkInputs = [ pytest coveralls pytestcov ]; - buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + checkInputs = [ + pytestCheckHook + coveralls + pytestcov + ]; - checkPhase = '' - py.test - ''; + nativeBuildInputs = [ + cython + numpy + ]; + + propagatedBuildInputs = [ + numpy + ]; + + # ERROR test/test_cftime.py - ModuleNotFoundError: No module named 'cftime._cft... + doCheck = false; meta = { description = "Time-handling functionality from netcdf4-python"; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8774b181fcf..41802f0d065 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -31,13 +31,20 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; + nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [ + cffi + ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optional (!isPyPy) cffi - ++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ]; + ] ++ stdenv.lib.optionals (!isPyPy) [ + cffi + ] ++ stdenv.lib.optionals isPy27 [ + ipaddress enum34 + ]; checkInputs = [ cryptography_vectors diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fe0fc9d3f8e..a68eb704f6c 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "af40774c0275f5465f49fd92bfcd9831b19b013de4cc77b8fb38aea76fa6dce3"; }; + outputs = [ "out" "dev" ]; + enableParallelBuilding = true; propagatedBuildInputs = [ protobuf grpcio setuptools ]; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 9311838627a..55d569c9054 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -6,6 +6,8 @@ buildPythonPackage rec { inherit (grpc) src version; pname = "grpcio"; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cython pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index c9ce6915d2e..a3d19df7653 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "1avsxzm5mwylmy2zbxq3xvn48z5djb0qy3hwv4ryncprivzri1n3"; }; + pythonNamespaces = [ "jaraco" ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 9f6e6e2aa7e..3c37755366d 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "be570ef4f2e7290b757449395238fa63d70a9255574624e73c5ff9f1ee554721"; }; + pythonNamespaces = [ "jaraco" ]; + doCheck = false; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 6ee4c241710..eb176d0d857 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { doCheck = false; + pythonNamespaces = [ "jaraco" ]; + meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; homepage = "https://github.com/jaraco/jaraco.functools"; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 5df70b6da97..f5d0b0538b6 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84"; }; + pythonNamespaces = [ "jaraco" ]; + nativeBuildInputs = [ setuptools_scm ]; patches = [ diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 3f9fa4d67ca..4a6391fbc48 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e"; }; + pythonNamespaces = [ "jaraco" ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 324eb625014..9a4f6d97245 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -3,10 +3,14 @@ buildPythonPackage rec { pname = "jaraco.stream"; version = "3.0.0"; + src = fetchPypi { inherit pname version; sha256 = "287e1cba9f278e0146fdded6bc40518930813a5584579769aeaa1d0bfd178a73"; }; + + pythonNamespaces = [ "jaraco" ]; + doCheck = false; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 9b3821edd7a..c61c8f689dd 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -13,6 +13,8 @@ buildPythonPackage rec { sha256 = "1v0hz3h74m31jlbc5bxwkvrx1h2n7887bajrg1n1c3yc4q8qn1z5"; }; + pythonNamespaces = [ "jaraco" ]; + nativeBuildInputs =[ setuptools_scm ]; propagatedBuildInputs = [ jaraco_functools diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix index 65473160480..0e1ec2a2765 100644 --- a/pkgs/development/python-modules/memcached/default.nix +++ b/pkgs/development/python-modules/memcached/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "memcached-1.51"; + pname = "memcached"; version = "1.51"; src = if isPy3k then fetchPypi { - inherit pname version; + inherit version; + pname = "python3-${pname}"; sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw"; } else fetchurl { url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 3e3316788ed..046f0a5bd5d 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -19,12 +19,18 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + numpy + ]; + + propagatedBuildInputs = [ + numpy + ]; checkPhase = '' runtest="$(pwd)/numexpr/tests/test_numexpr.py" pushd "$out" - ${python}/bin/${python.executable} "$runtest" + ${python.interpreter} "$runtest" popd ''; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 079c93db450..3fd93493860 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "13hcj6g7k7yvj7nry2ar6f5mg58ln7frrvq1cg5f8mczxh1ch6zl"; + sha256 = "TXljeRFonQwEmlIGMnTHwdfPsd9cMOVn5/1zb3tYBfI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index d8cc4511948..04bc56df12d 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, unittest2 }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: buildPythonPackage rec { pname = "pyflakes"; @@ -11,6 +11,9 @@ buildPythonPackage rec { checkInputs = [ unittest2 ]; + # some tests are output dependent, which have changed slightly + doCheck = pythonOlder "3.9"; + meta = with stdenv.lib; { homepage = "https://launchpad.net/pyflakes"; description = "A simple program which checks Python source files for errors"; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index b86947f5f75..9d9add16782 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.0.3"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169"; + sha256 = "fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5"; }; propagatedBuildInputs = [ coverage ]; diff --git a/pkgs/development/python-modules/seccomp/default.nix b/pkgs/development/python-modules/seccomp/default.nix new file mode 100644 index 00000000000..3257722b178 --- /dev/null +++ b/pkgs/development/python-modules/seccomp/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, lib +, cython, libseccomp +}: + +buildPythonPackage rec { + pname = "libseccomp"; + version = libseccomp.version; + src = libseccomp.pythonsrc; + + VERSION_RELEASE = version; # used by build system + + nativeBuildInputs = [ cython ]; + buildInputs = [ libseccomp ]; + + unpackCmd = "tar xf $curSrc"; + doInstallCheck = true; + + postPatch = '' + substituteInPlace ./setup.py \ + --replace 'extra_objects=["../.libs/libseccomp.a"]' \ + 'libraries=["seccomp"]' + ''; + + meta = with lib; { + description = "Python bindings for libseccomp"; + license = with licenses; [ lgpl21 ]; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index b4cbd3bff9a..e4a3c94711f 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -32,11 +32,11 @@ buildPythonPackage rec { pname = "sphinx"; - version = "3.0.3"; + version = "3.3.1"; src = fetchPypi { pname = "Sphinx"; inherit version; - sha256 = "0wpmqfx4mxv5kv9xxd6wyfsm8vcnp8p99h14q7b6if2mv69gvvb2"; + sha256 = "1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix index 9bd2bc78437..5c93e957f7c 100644 --- a/pkgs/development/python-modules/tensorflow/1/bin.nix +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, pythonOlder, isPy38 +, isPy3k, pythonOlder, pythonAtLeast , astor , gast , google-pasta @@ -50,8 +50,7 @@ in buildPythonPackage { inherit pname; inherit (packages) version; format = "wheel"; - - disabled = isPy38; + disabled = pythonAtLeast "3.8"; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index acb5f473ec9..8dd282666a7 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, pythonOlder, isPy38 +, isPy3k, pythonOlder, pythonAtLeast, isPy38 , astor , gast , google-pasta @@ -54,7 +54,7 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; - disabled = isPy38; + disabled = pythonAtLeast "3.8"; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 8f61f2ffc66..d57416ac18a 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -1,4 +1,5 @@ { stdenv, pkgconfig, fetchPypi, buildPythonPackage +, buildPackages , zstd, pytest }: buildPythonPackage rec { @@ -12,7 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" + --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" ''; nativeBuildInputs = [ pkgconfig ]; |