diff options
Diffstat (limited to 'pkgs/development/python-modules')
33 files changed, 291 insertions, 110 deletions
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 3c685e0f34bc..b88c3c69b5d9 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.10"; + version = "0.29.13"; src = fetchPypi { inherit pname version; - sha256 = "26229570d6787ff3caa932fe9d802960f51a89239b990d275ae845405ce43857"; + sha256 = "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 28cd08fb0fc3..c32fefbbdfec 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; buildPythonPackage rec { - version = "3.1.6"; + version = "3.1.7"; pname = "bcrypt"; src = fetchPypi { inherit pname version; - sha256 = "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea"; + sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix index 19a469dad262..bd7bde42901e 100644 --- a/pkgs/development/python-modules/cairocffi/0_9.nix +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -1,4 +1,4 @@ -# FIXME: make gdk_pixbuf dependency optional +# FIXME: make gdk-pixbuf dependency optional { stdenv , buildPythonPackage , pythonOlder @@ -15,7 +15,7 @@ , withXcffib ? false, xcffib , python , glib -, gdk_pixbuf +, gdk-pixbuf }@args: import ./generic.nix ({ diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 528c845c07ea..f91b33d20102 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -1,4 +1,4 @@ -# FIXME: make gdk_pixbuf dependency optional +# FIXME: make gdk-pixbuf dependency optional { stdenv , buildPythonPackage , pythonOlder @@ -15,7 +15,7 @@ , withXcffib ? false, xcffib , python , glib -, gdk_pixbuf +, gdk-pixbuf }@args: import ./generic.nix ({ diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch index 862f7bd4bf7c..a1018e6eb33b 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch @@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info> Date: Sat Feb 6 08:09:06 2016 +0200 Patch dlopen() to allow direct paths to all required libs - + This patch is NixOS specific diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py @@ -13,15 +13,15 @@ index 718aa7f..1a1dcff 100644 @@ -27,20 +27,22 @@ VERSION = '0.7.2' version = '1.10.0' version_info = (1, 10, 0) - + +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime +_LIBS = { + 'cairo': '@cairo@/lib/libcairo@ext@', + 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', + 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', -+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', ++ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', +} - + -def dlopen(ffi, *names): +def dlopen(ffi, name, *names): """Try various names for the same library, for different platforms.""" @@ -42,6 +42,6 @@ index 718aa7f..1a1dcff 100644 + if lib: + return lib + raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) - - + + cairo = dlopen(ffi, 'cairo', 'cairo-2') diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch index d42b8bcce48e..9fd2832b323f 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info> Date: Sat Feb 6 08:09:06 2016 +0200 Patch dlopen() to allow direct paths to all required libs - + This patch is NixOS specific diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py @@ -13,15 +13,15 @@ index 6061973..3538a58 100644 @@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() version = '1.16.0' version_info = (1, 16, 0) - + +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime +_LIBS = { + 'cairo': '@cairo@/lib/libcairo@ext@', + 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', + 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', -+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', ++ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', +} - + -def dlopen(ffi, *names): +def dlopen(ffi, name, *names): """Try various names for the same library, for different platforms.""" @@ -41,6 +41,6 @@ index 6061973..3538a58 100644 + if lib: + return lib + raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) - - + + cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2') diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index 4fa5cc466c31..cf1618a865b4 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { ''; patches = [ - # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 + # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0 (substituteAll { src = dlopen_patch; ext = stdenv.hostPlatform.extensions.sharedLibrary; cairo = cairo.out; glib = glib.out; - gdk_pixbuf = gdk_pixbuf.out; + gdk_pixbuf = gdk-pixbuf.out; }) ./fix_test_scaled_font.patch ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 07dc701f3b1b..935c0d600613 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.3.9"; + version = "2019.6.16"; src = fetchPypi { inherit pname version; - sha256 = "1bnpw7hrf9i1l9gfxjnzi45hkrvzz0pyn9ia8m4mw7sxhgb08qdj"; + sha256 = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"; }; meta = { diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index bb345ddc48ea..f95da9b75b22 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -10,22 +10,13 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.9.0.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5"; + sha256 = "ed9f6a07c2bac70d6c597df360d0666d11d2adc90141d54c5c2db08b380a4fac"; }; - patches = [ - # temporal fix for a test failure: https://github.com/pytoolz/cytoolz/issues/122 - (fetchpatch { - name = "py37.patch"; - url = https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch; - sha256 = "1z29y7s5n751q3f74r3bz0f48yg6izvi68hc4pkwcalxmkq5r1n9"; - }) - ]; - # Extension types disabled = isPyPy; diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix new file mode 100644 index 000000000000..bce69bffff2f --- /dev/null +++ b/pkgs/development/python-modules/glob2/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "glob2"; + version = "0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5"; + }; + + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with lib; { + description = "Version of the glob module that can capture patterns and supports recursive wildcards"; + homepage = https://github.com/miracle2k/python-glob2/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 043f58cfa5d4..94494ed7854f 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.0"; + version = "5.1.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f"; + sha256 = "f0e962052718068ad3b1d8bcc703794660858f58803c3798628817f492a8769c"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index f94b690b7f7b..14b083ab500c 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,25 +22,18 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.5.0"; + version = "7.6.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26"; + sha256 = "11067ab11d98b1e6c7f0993506f7a5f8a91af420f7e82be6575fcb7a6ca372a0"; }; prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace setup.py --replace "'gnureadline'" " " ''; - patches = [ - (fetchpatch { - url = "https://github.com/ipython/ipython/commit/e1b53e9ef91a43b9e275bb9e48b4253218375d87.patch"; - sha256 = "sha256:0q7zsgalwxss6aikhakbdkvvz0g4ac4sa3ncrklm74ksqh56rsgb"; - }) - ]; - buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index b91b5d7a775b..fd71569e293e 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.4.2"; + version = "7.5.0"; src = fetchPypi { inherit pname version; - sha256 = "a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3"; + sha256 = "cb263c6974aca902d00a435711823bb4aaf6614a5f997f517e15fa84151e8fa2"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index a4dc719b7afd..c3643e674c3b 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.4"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551"; + sha256 = "98e8af5edff5d24e4d31e73bc21043130ae9d955a91aa93fc0bc3b1d0f7b5880"; }; checkInputs = [ ipykernel ipython mock pytest ]; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index e89154c0bc43..88679197be1c 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7"; + sha256 = "2c6e7c1e9f2ac45b5c2ceea5730bc9008d92fe59d0725eac57b04c0edfba24f7"; }; checkInputs = [ pytest mock glibcLocales ]; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index c9ab72894efe..d4f9bea11b5b 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,21 +15,31 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "3f18b87af4e94ccd073263dd58cd3eebabe9f5e4d6ab535b39d3af64811c7eda"; + sha256 = "0g8xl4158ngyhiynrkk72jpawnk4isznbijz0w085g269fps0vp2"; }; - LC_ALL = "en_US.UTF-8"; + checkInputs = [ + pytest + matplotlib + sympy + pytestcov + ]; - buildInputs = [ glibcLocales ]; - checkInputs = [ matplotlib sympy pytestcov ]; - propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ]; + propagatedBuildInputs = [ + coverage + ipykernel + jupyter_client + nbformat + pytest + six + ]; checkPhase = '' - pytest tests --current-env --ignore tests/test_timeouts.py + pytest tests --ignore tests/test_timeouts.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index ebb7aac39241..78593e443b17 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "0.44.0"; + version = "0.45.0"; pname = "numba"; src = fetchPypi { inherit pname version; - sha256 = "56421bfc62f3c7c996ff11d5db7fc410909564e41b55379a82b9188fa4aa22f9"; + sha256 = "fcea8dc6f9e0f1ddf7bd52a207858539bc14e893c5ee66d8730c3e5b9344c4b3"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index a02e7ee4c5f5..10a1df8876cb 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.4"; + version = "1.17.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7"; + sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a"; }; nativeBuildInputs = [ gfortran pytest ]; @@ -60,10 +60,9 @@ in buildPythonPackage rec { inherit blasImplementation cfg; }; - # Disable two tests - # - test_f2py: f2py isn't yet on path. + # Disable test # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_f2py,test_large_file_support"; + NOSE_EXCLUDE="test_large_file_support"; meta = { description = "Scientific tools for Python"; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix new file mode 100644 index 000000000000..6283addcb6eb --- /dev/null +++ b/pkgs/development/python-modules/pandas/2.nix @@ -0,0 +1,122 @@ +# Python 2 expression + +{ buildPythonPackage +, fetchPypi +, python +, stdenv +, pytest +, glibcLocales +, cython +, dateutil +, scipy +, moto +, numexpr +, pytz +, xlrd +, bottleneck +, sqlalchemy +, lxml +, html5lib +, beautifulsoup4 +, hypothesis +, openpyxl +, tables +, xlwt +, runtimeShell +, libcxx ? null +}: + +let + inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv) isDarwin; + +in buildPythonPackage rec { + pname = "pandas"; + version = "0.24.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"; + }; + + checkInputs = [ pytest glibcLocales moto hypothesis ]; + + nativeBuildInputs = [ cython ]; + buildInputs = optional isDarwin libcxx; + propagatedBuildInputs = [ + dateutil + scipy + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib + beautifulsoup4 + openpyxl + tables + xlwt + ]; + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + postPatch = optionalString isDarwin '' + cpp_sdk="${libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + ''; + + + disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case + "test_fallback_plural" + "test_ambiguous_flags" + "test_ambiguous_compat" + # Locale-related + "test_names" + "test_dt_accessor_datetime_name_accessors" + "test_datetime_name_accessors" + # Can't import from test folder + "test_oo_optimizable" + # Disable IO related tests because IO data is no longer distributed + "io" + # KeyError Timestamp + "test_to_excel" + ] ++ optionals isDarwin [ + "test_locale" + "test_clipboard" + ]); + + doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture + + checkPhase = '' + runHook preCheck + '' + # TODO: Get locale and clipboard support working on darwin. + # Until then we disable the tests. + + optionalString isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + echo "#!${runtimeShell}" > pbcopy + echo "#!${runtimeShell}" > pbpaste + chmod a+x pbcopy pbpaste + export PATH=$(pwd):$PATH + '' + '' + LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests" + runHook postCheck + ''; + + meta = { + # https://github.com/pandas-dev/pandas/issues/14866 + # pandas devs are no longer testing i686 so safer to assume it's broken + broken = stdenv.isi686; + homepage = http://pandas.pydata.org/; + description = "Python Data Analysis Library"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ raskin knedlsepp ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7416717585f1..6f1c2c68dd31 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.24.2"; + version = "0.25.0"; src = fetchPypi { inherit pname version; - sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"; + sha256 = "914341ad2d5b1ea522798efa4016430b66107d05781dbfe7cf05eba8f37df995"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 9fb27c88c029..93ea1e6734be 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -11,27 +11,34 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.43.0.2"; + version = "7.43.0.3"; disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4"; + sha256 = "13nsvqhvnmnvfk75s8iynqsgszyv06cjp4drd3psi7zpbh63623g"; }; - buildInputs = [ curl openssl.out ]; - nativeBuildInputs = [ curl ]; + buildInputs = [ + curl + openssl.out + ]; - checkInputs = [ bottle pytest nose flaky ]; + nativeBuildInputs = [ + curl + ]; + + checkInputs = [ + bottle + pytest + nose + flaky + ]; checkPhase = '' - py.test -k "not ssh_key_cb_test \ - and not test_libcurl_ssl_gnutls \ - and not test_libcurl_ssl_nss \ - and not test_libcurl_ssl_openssl \ - and not test_libcurl_ssl_unrecognized \ - and not test_request_with_verifypeer \ - and not test_ssl_in_static_libs" tests + pytest tests -k "not test_ssl_in_static_libs \ + and not test_keyfunction \ + and not test_keyfunction_bogus_return" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 1b00e1264ffc..b3093390e3b8 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -7,7 +7,7 @@ , pytest , glibc , gtk2-x11 -, gdk_pixbuf +, gdk-pixbuf }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { elif name == 'gdk-x11-2.0': path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}' elif name == 'gdk_pixbuf-2.0': - path = '${gdk_pixbuf}/lib/libgdk_pixbuf-2.0${ext}' + path = '${gdk-pixbuf}/lib/libgdk_pixbuf-2.0${ext}' if path is not None: return ctypes.cdll.LoadLibrary(path) raise Exception("Could not load library {}".format(names)) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 713861deae37..ec17b77ba200 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -46,6 +46,8 @@ let # These tests, we disable always. "test_set_default_verify_paths" "test_fallback_default_verify_paths" + # https://github.com/pyca/pyopenssl/issues/768 + "test_wantWriteError" ] ++ ( optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests ) ++ ( diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 581de7beeebc..12a7baa55bf5 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -14,9 +14,20 @@ buildPythonPackage rec { sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3"; }; - propagatedBuildInputs = [ pyannotate pytest ]; + buildInputs = [ + pytest + ]; - # not testing for a testing module... + propagatedBuildInputs = [ + pyannotate + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest>=3.2.0,<4.0.0" "pytest" + ''; + + # no testing in a testing module... doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 8fba5e90ab11..58e032df4df0 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, isPy3k +, pytest +, mock +, setuptools_scm +}: buildPythonPackage rec { pname = "pytest-mock"; @@ -10,7 +18,14 @@ buildPythonPackage rec { }; propagatedBuildInputs = lib.optional (!isPy3k) mock; - nativeBuildInputs = [ setuptools_scm pytest ]; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + pytest + ]; patches = [ # Fix tests for pytest 4.6. Remove with the next release @@ -21,7 +36,9 @@ buildPythonPackage rec { ]; checkPhase = '' - py.test + # remove disabled test on next release + # https://github.com/pytest-dev/pytest-mock/pull/151 + pytest -k "not test_detailed_introspection" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 84dfb549fe1c..9663d9ab04bf 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.1"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; + sha256 = "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955"; }; # force regeneration using Cython diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 90522c34196a..057283babe7b 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -2,11 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, six -, docutils -, pygments -, bleach -, html5lib +, readme_renderer }: buildPythonPackage rec { @@ -18,20 +14,27 @@ buildPythonPackage rec { sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ six docutils pygments bleach html5lib ]; + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + readme_renderer + ]; checkPhase = '' - py.test + pytest ''; - # Tests fail, possibly broken. + # tests are not included with pypi release + # package is not readme_renderer doCheck = false; meta = with stdenv.lib; { description = "Readme is a library for rendering readme descriptions for Warehouse"; homepage = "https://github.com/pypa/readme"; license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 063c6d950711..260c03295760 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.21.0"; + version = "2.22.0"; src = fetchPypi { inherit pname version; - sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"; + sha256 = "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"; }; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 250191559055..46daaa21a995 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1fhsq3bz5ya54ipa0cb8qgfj7gfgxprv4briig0ly4r11rj23wv5"; + sha256 = "320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10"; }; checkInputs = with self; [ nose ]; diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 974e3a43bc7c..7f506e564139 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec{ pname = "toolz"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index c5701902e08c..f6038acc1cab 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.32.1"; + version = "4.32.2"; src = fetchPypi { inherit pname version; - sha256 = "0a860bf2683fdbb4812fe539a6c22ea3f1777843ea985cb8c3807db448a0f7ab"; + sha256 = "25d4c0ea02a305a688e7e9c2cdc8f862f989ef2a4701ab28ee963295f5b109ab"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index ab2bd9c4eb18..b2329f4f9633 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.4.2"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265"; + sha256 = "8c9b4d73e388f2484296be18432d3cc0b8d59de243079a0db16a56c5571e1f86"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 930729c052e1..de4be0620013 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "0wlpyzxdhcc043g9sjbrflky7xwdyq487v64i532zb2fpjskd59s"; + sha256 = "9310e610af988acb57a2627b10025a250bcbe172e66d3750a6dd3b3c5357da56"; }; checkInputs = [ pytest ]; |