diff options
Diffstat (limited to 'pkgs/development/python-modules')
5 files changed, 65 insertions, 14 deletions
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 61080e5e4c46..9405e3489d4f 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -1,20 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , beautifulsoup4, bottle, chardet, dateutil -, google_api_python_client, lxml, ply, python_magic -, pytest, requests }: +, google_api_python_client, lxml, oauth2client +, ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.2.1"; + version = "2.2.3"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0xrgmqv0wsc0makm5i6jwng99yp3rvm30v2xqmcah60fgjymkjzb"; + sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"; }; - # No tests in archive + # Tests require files not included in the PyPI archive. doCheck = false; propagatedBuildInputs = [ @@ -24,6 +24,7 @@ buildPythonPackage rec { dateutil google_api_python_client lxml + oauth2client ply python_magic requests diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index b0b6bfaa5ef9..315d4756e0db 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchpatch, fetchPypi , pytest, mock, oauth2client, flask, requests, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }: buildPythonPackage rec { @@ -9,6 +9,13 @@ buildPythonPackage rec { inherit pname version; sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4"; }; + patches = [ + (fetchpatch { + name = "use-new-pytest-api-to-keep-building-with-pytest5.patch"; + url = "https://github.com/googleapis/google-auth-library-python/commit/b482417a04dbbc207fcd6baa7a67e16b1a9ffc77.patch"; + sha256 = "07jpa7pa6sffbcwlsg5fgcv2vvngil5qpmv6fhjqp7fnvx0674s0"; + }) + ]; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa ]; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 3853d796fcd6..734a51c7be61 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1dj8jh5ccjv7qbydf49cw17py7z3jjkaxk4jj2gx6mq2f4w304wg"; + sha256 = "1spjkw5nxhbawblj5db8izff05kjw425iyydipajb7qh73vm25r0"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 1b89cb5ada7f..25ef662edef9 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,12 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, python +, pytest +, cmake +, numpy ? null +, eigen ? null +, scipy ? null +}: buildPythonPackage rec { pname = "pybind11"; version = "2.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr"; + src = fetchFromGitHub { + owner = "pybind"; + repo = pname; + rev = "v${version}"; + sha256 = "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf"; }; patches = [ @@ -14,10 +26,21 @@ buildPythonPackage rec { url = https://github.com/pybind/pybind11/commit/44a40dd61e5178985cfb1150cf05e6bfcec73042.patch; sha256 = "047nzyfsihswdva96hwchnp4gj2mlbiqvmkdnhxrfi9sji8x31ka"; }) + (fetchpatch { + name = "pytest-4-excinfo-fix.patch"; + url = https://github.com/pybind/pybind11/commit/9fd4712121fdbb6202a35be4c788525e6c8ab826.patch; + sha256 = "07jjv8jlbszvr2grpm5xqxjac7jb0y68lgb1jcbb93k9vyp1hr33"; + }) ]; - # Current PyPi version does not include test suite - doCheck = false; + checkInputs = [ pytest cmake ] + ++ (lib.optional (numpy != null) numpy) + ++ (lib.optional (eigen != null) eigen) + ++ (lib.optional (scipy != null) scipy); + checkPhase = '' + cmake ${if eigen != null then "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" else ""} + make -j $NIX_BUILD_CORES pytest + ''; meta = { homepage = https://github.com/pybind/pybind11; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix new file mode 100644 index 000000000000..978f8749d3b3 --- /dev/null +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, openssl, bzip2 }: + +buildPythonPackage rec { + pname = "zeroc-ice"; + version = "3.7.2"; + + src = fetchPypi { + inherit version pname; + sha256 = "1bs7h3k9nd1gls2azgp8gz9407cslxbi2x1gspab8p87a61pjim8"; + }; + + buildInputs = [ openssl bzip2 ]; + + meta = with stdenv.lib; { + homepage = https://zeroc.com/; + license = licenses.gpl2; + description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more."; + maintainers = with maintainers; [ abbradar ]; + }; +} |