diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 99d23b0eb7cf2..41bc94a51300c 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -62,6 +62,14 @@ let # No tests included doCheck = false; }; + + pylru = super.pylru.overridePythonAttrs (oldAttrs: rec { + version = "1.0.9"; + src = oldAttrs.src.override { + inherit version; + sha256 = "71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c"; + }; + }); }; }; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index a72fabb35cd4f..71229b886e7bc 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "1224b971c174f33b954f9a1906679d0049399bd6a5a8c78bbae2d6c2c4facebd"; + sha256 = "98a94b32d4929d3e34595b4654b8e7f951182f540056b9cb734c88899912f729"; }; meta = { diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 17a0240f7e8ca..a087eaeca8341 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "932e6acb1a57bdcfb784a1ce6ad46a2f50b89d355a5619ed6df60db1414173d2"; + sha256 = "1e6e70506fb4d867cf269af7bcc27b744c36bbc4c516f0f8ccf2039956deea72"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index c42ad6f1d6c90..bce64a635e370 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -2,12 +2,12 @@ , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: buildPythonPackage rec { - version = "0.12.0"; + version = "0.12.1"; pname = "aws-adfs"; src = fetchPypi { inherit pname version; - sha256 = "1cjrm61k6905dmhgrqyc5caxx5hbhj3sr6cx4r6sbdyz453i7pc6"; + sha256 = "72725d7005252b96ccfa9719fe4beec2b86301bff894d4d97a50fc1d05393fd8"; }; # Relax version constraint diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index dca7844dec9c5..31f050007a680 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.7.57"; + version = "1.7.84"; src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "0rp3vclx7mvfl6isa47m7dzlrf33qb9vj53p0gj4cw3mgl14cnbl"; + sha256 = "0d9kqjqmnn53p1xpmdbbjxcxv2482yx3vjhxw8izp0mpq58i5c14"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 32e527e8b6763..989b6e944dea1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -7,16 +7,15 @@ , simplejson , mock , nose -, urllib3 }: buildPythonPackage rec { pname = "botocore"; - version = "1.11.1"; + version = "1.10.84"; src = fetchPypi { inherit pname version; - sha256 = "5b2d2393c02a082d605dac13c1322c3c553a4d4cf23de7b48268ae7f4a105eb3"; + sha256 = "d3e4b5a2c903ea30d19d41ea2f65d0e51dce54f4f4c4dfd6ecd7b04f240844a8"; }; propagatedBuildInputs = [ @@ -25,7 +24,6 @@ buildPythonPackage rec { docutils ordereddict simplejson - urllib3 ]; checkInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index c9ca8f7ec0473..c4db013ea34d3 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , fetchPypi , nose +, pytest , numpy , python }: @@ -15,10 +16,10 @@ buildPythonPackage rec { sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest nose ]; propagatedBuildInputs = [ numpy ]; checkPhase = '' - nosetests -v $out/${python.sitePackages} + py.test -p no:warnings $out/${python.sitePackages} ''; postPatch = '' substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" diff --git a/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch b/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch deleted file mode 100644 index 4d142275b9e84..0000000000000 --- a/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py -index 1588349..5452910 100644 ---- a/cairocffi/test_cairo.py -+++ b/cairocffi/test_cairo.py -@@ -292,7 +292,8 @@ def test_pdf_surface(): - pdf_bytes = file_obj.getvalue() - assert pdf_bytes.startswith(b'%PDF') - assert b'/MediaBox [ 0 0 123 432 ]' in pdf_bytes -- assert pdf_bytes.count(b'/Type /Page\n') == 1 -+ assert pdf_bytes.count(b'/Type /Pages') == 1 -+ assert pdf_bytes.count(b'/Type /Page') == 2 - - file_obj = io.BytesIO() - surface = PDFSurface(file_obj, 1, 1) -@@ -306,7 +307,8 @@ def test_pdf_surface(): - assert b'/MediaBox [ 0 0 1 1 ]' not in pdf_bytes - assert b'/MediaBox [ 0 0 12 100 ]' in pdf_bytes - assert b'/MediaBox [ 0 0 42 700 ]' in pdf_bytes -- assert pdf_bytes.count(b'/Type /Page\n') == 2 -+ assert pdf_bytes.count(b'/Type /Pages') == 1 -+ assert pdf_bytes.count(b'/Type /Page') == 3 - - - def test_svg_surface(): diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 39799daca2157..bdd11fb3de6f6 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -49,7 +49,6 @@ buildPythonPackage rec { gdk_pixbuf = gdk_pixbuf.out; }) ./fix_test_scaled_font.patch - ./cairocffi-0.8.1-cairo-1.15.12.patch ]; meta = with lib; { diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 8eef07ac3bb3e..df260b3adb7dc 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -38,7 +38,7 @@ in buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - buildInputs = [ pytest case ]; + checkInputs = [ pytest_32 case ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index 8947ff436fa3a..16b74913b7b06 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "cement"; @@ -13,6 +13,8 @@ buildPythonPackage rec { # 127.0.0.1:11211. doCheck = false; + disabled = !isPy3k; + meta = with stdenv.lib; { homepage = http://builtoncement.com/; description = "A CLI Application Framework for Python."; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 4c2e78a102e5f..4217d193cfea9 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama -, contextlib2 ? null +, contextlib2 ? null, setuptools_scm , pytest, mock, which, glibcLocales }: buildPythonPackage rec { @@ -31,6 +31,10 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; disabled = !isPy3k; + buildInputs = [ + setuptools_scm + ]; + propagatedBuildInputs = [ colorama pyperclip diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 53286b38722b4..3951558cf2707 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "deform"; - version = "2.0.5"; + version = "2.0.6"; src = fetchPypi { inherit pname version; - sha256 = "874d3346a02c500432efdcc73b1a7174aa0ea69cd52a99bb9a812967f54f6f79"; + sha256 = "bda0b809c8a668e105e30650a6766103207eafdd12c313acd59274ccd2c4d297"; }; postPatch = '' diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 711f4ac1e0ecc..01bd23c4b6ffe 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "dftfit"; - version = "0.4.11"; + version = "0.4.22"; disabled = (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "c6e36a793f9f94746bb8a04fb8316404aeacfa918704de07b15e1b4b8b62242d"; + sha256 = "06dbdc21cf9ed199bfceae5301172bee2164a3b9ef6f0814a089530c320ebb3a"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 74ed13da8b46e..93337aa8d18d4 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.17"; + version = "0.8.18"; src = fetchPypi { inherit pname version; - sha256 = "0e9a1227a3a0f3297a485715e72ee6eb77081b17b629367042b586e38c03c867"; + sha256 = "0184fa252f86214308bb6bed344f96294f2e3528fbffafc727890cf2a86d6027"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index e1c4306b1f803..7ff4a37d6d389 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "08681be47b1861221bc7cf17b6e368a8d734db81682d716c22a11e839f47cb79"; }; - checkInputs = [ pytest numpy nbconvert pandas mock ]; + checkInputs = [ pytest nbconvert pandas mock ]; propagatedBuildInputs = [ jinja2 branca six requests numpy ]; # No tests in archive diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 2b95b1473cb21..01c33117849e8 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -37,6 +37,9 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy six] ++ optionals mpiSupport [ mpi4py openssh ]; + # https://github.com/h5py/h5py/issues/1088 + doCheck = false; + meta = { description = "Pythonic interface to the HDF5 binary data format"; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 9133980754e37..7164fd1197b89 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -9,10 +9,10 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "e9f04885cf11704669f3a731ea6ac00bbc7dea16137aa4394ef7c272cdb9d008"; + sha256 = "333b9bf16ff015d6b56bf80b9831afdd243443cb84c7ff7b6e342f117e354c42"; }; checkInputs = [ sphinx numpydoc pytest ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index f6cbea2c36e08..23aaff8a72813 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }: buildPythonPackage rec { pname = "jupyterlab"; - version = "0.34.2"; + version = "0.34.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "37f66118b35c11fd51f0680e665139d62f86fe54f1e30d2517a1eabb30616ce4"; + sha256 = "d6e5a3855a0d55e6aa4ab704379da5da3db2e652442e79acfa2e9d14ef50ccb3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 9f3fc8dc4d369..9564e4f37033c 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -11,12 +11,15 @@ buildPythonPackage rec { sha256 = "0nnva8g03dv6gdhjk1ihn2qw7g15232fyj8shipah9whgfv8d75m"; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--flake8" "" + ''; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six ]; - # Fails with "ImportError: cannot import name mock" - #doCheck = false; - checkInputs = [ pytest pytest-flake8 keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; + checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 6d2c503d5eff1..f9d1fee8973be 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,14 +1,14 @@ { buildPythonPackage, fetchPypi, jinja2, werkzeug, flask , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses -, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: +, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml, python-jose }: buildPythonPackage rec { pname = "moto"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "7c86d1c3bd6362954afaded735354c11afd22037eb6736152f057a1bff0c8868"; + sha256 = "52426f2567e51ba73fdc7c7d617236b7e7918dca2421caabe13e5290942b53d8"; }; postPatch = '' @@ -42,6 +42,7 @@ buildPythonPackage rec { botocore docker responses + python-jose ]; checkInputs = [ boto3 nose sure freezegun ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index e952129f15d9c..561135dda57de 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -4,8 +4,6 @@ , fetchPypi , hypothesis , pytestcache -, pytestflakes -, pytestpep8 , pytest , glibcLocales , mock ? null @@ -19,8 +17,6 @@ buildPythonPackage rec { checkInputs = [ hypothesis pytestcache - pytestflakes - pytestpep8 pytest glibcLocales ] @@ -37,7 +33,7 @@ buildPythonPackage rec { # testing based on project's tox.ini checkPhase = '' pytest --doctest-modules natsort - pytest --flakes --pep8 + pytest ''; meta = { diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 311b12c12aec2..6445201c40b46 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.5"; + version = "2.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0f391b0035d7c98f25aad539726e8efc77eea250ff1a120ea7d264c03a16f5fe"; + sha256 = "04091e034911a0afc531c3a15e5ae0b1b6a43654dbf63c187f47d20cdfefac1c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 1cc33ad51e382..02427a5242579 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -80,6 +80,8 @@ in buildPythonPackage rec { "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" diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 903be34ed0fdc..542a68728af1c 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.4.1"; + version = "4.4.2"; propagatedBuildInputs = [ zope_interface ]; src = fetchPypi { inherit pname version; - sha256 = "2aedeaaf09fed52f63324b178d0addfe1c558340d68d04aafe85abafaafd8699"; + sha256 = "451c756b4f4faa5f06f87d57f5928758bb3a16a586ceaa8773c35367188eddf9"; }; meta = { diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 42a12f72158bc..a6ca8fae7cbd5 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.11"; + version = "8.9.12"; src = fetchPypi { inherit pname version; - sha256 = "1c31db3859aada0568e7afe7231c4e795f34bfcf5749e31c9d1da3c72ba7059b"; + sha256 = "39cd0c67a17a9ca4c2851ab8fad5272948d811ccd2a8e52ddcc8d275a802af70"; }; meta = { diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 012226de05326..8c697b8b2ec91 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23"; + sha256 = "1117fc0536e1638862917efbdc0895e6b62fa61e6cf4f39bb655686af7af9627"; }; buildInputs = [ pytest ]; checkInputs = [ pytest pexpect ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 3fae0442a662e..3770f62f1a5bc 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2 }: buildPythonPackage rec { - version = "3.7.2"; + version = "3.7.4"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3459a123ad5532852d36f6f4501dfe1acf4af1dd9541834a164666aa40395b02"; + sha256 = "2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349"; }; checkInputs = [ hypothesis mock ]; diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 71b1260a54070..4d9b9b7615776 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -11,6 +11,17 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm pytest ]; + postPatch = '' + rm pytest.ini + ''; + + checkPhase = '' + py.test tests + ''; + + # Fixture not found + doCheck = false; + meta = with stdenv.lib; { description = "Invoke py.test as distutils command with dependency resolution"; homepage = https://bitbucket.org/pytest-dev/pytest-runner; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index cb99e5fa273b3..68b46743d35f6 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,29 +1,30 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, six, ecdsa, rsa, future, pytest, cryptography, pycryptodome +, future, six, ecdsa, pycryptodome, pytest, cryptography }: buildPythonPackage rec { pname = "python-jose"; - version = "3.0.0"; + version = "2.0.2"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; - rev = version; - sha256 = "1dq8v87abqxv07wi403ywjk9jg1da125fviycqzki48cjxx0dhwj"; + # 2.0.2 not tagged on GitHub + # see https://github.com/mpdavis/python-jose/issues/86 + rev = "28cc6719eceb89129eed59c25f7bdac015665bdd"; + sha256 = "03wkq2rszy0rzy5gygsh4s7i6ls8zflgbcvxnflvmh7nis7002fp"; }; checkInputs = [ pytest - # optional dependencies, but needed in tests - cryptography pycryptodome + cryptography # optional dependency, but needed in tests ]; checkPhase = '' py.test ''; - propagatedBuildInputs = [ six ecdsa rsa future ]; + propagatedBuildInputs = [ future six ecdsa pycryptodome ]; meta = with stdenv.lib; { homepage = https://github.com/mpdavis/python-jose; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 2394858e13e81..57d8ca4a263c1 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.08.17"; + version = "2018.08.29"; src = fetchPypi { inherit pname version; - sha256 = "56494baf1ed525deea426d3676b1ae3fdcc906b55eccfcb4ea928453e11f2a43"; + sha256 = "b73cea07117dca888b0c3671770b501bef19aac9c45c8ffdb5bea2cca2377b0a"; }; postCheck = '' diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index cf9e175490dd2..b2eb0668de6ca 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -9,6 +9,9 @@ buildPythonPackage rec { sha256 = "da8cc90883f8e5ab4af0d746438f608662f5f2a35da2e858517927edefa134b0"; }; + # No tests in PyPI tarball + doCheck = false; + meta = with lib; { homepage = http://sarge.readthedocs.org/; description = "A wrapper for subprocess which provides command pipeline functionality"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 41878b19d0859..140e8cc80b4d8 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, fetchpatch}: buildPythonPackage rec { pname = "scipy"; @@ -18,6 +18,10 @@ buildPythonPackage rec { rm scipy/linalg/tests/test_lapack.py ''; + # INTERNALERROR, solved with https://github.com/scipy/scipy/pull/8871 + # however, it does not apply cleanly. + doCheck = false; + preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index b386fe6c2fabb..ac035061692b1 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shippai"; # Please make sure that vdirsyncer still builds if you update this package. - version = "0.3.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "9e8d1ca5a742a7ea175cebda3090497d42348517e8d2f05f9854d0f30f1a48ad"; + sha256 = "1ppwywzg4d12h658682ssmingm6ls6a96p4ak26i2w9d4lf8pfsc"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index b8b67f708e6d8..32ac94da76150 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sockjs-tornado"; - version = "1.0.3"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + sha256 = "4c4bcf33c8a238bbab37d01da769bcf89e74ef6019bfa76ddbcb4d682d47187e"; }; propagatedBuildInputs = [ tornado ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 525ff4122d8f4..9e71766065c58 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { pname = "Sphinx"; - version = "1.7.7"; + version = "1.7.8"; src = fetchPypi { inherit pname version; - sha256 = "71531900af3f68625a29c4e00381bee8f85255219a3d500a3e255076a45b735e"; + sha256 = "a07050845cc9a2f4026a6035cc8ed795a5ce7be6528bbc82032385c10807dfe7"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index d1a9185d5a149..e363ca22cf2d7 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -5,11 +5,11 @@ let in buildPythonPackage rec { pname = "typing"; - version = "3.6.4"; + version = "3.6.6"; src = fetchPypi { inherit pname version; - sha256 = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2"; + sha256 = "4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d"; }; # Error for Python3.6: ImportError: cannot import name 'ann_module' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 92e5459df49d1..ccd9f05a33514 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.1"; + version = "1.15.66"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "5068efde694e24462646d271335fdef3dde8a0fbbfb986fab0ce7e5368a7df8d"; + sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4"; }; # No tests included @@ -44,7 +44,7 @@ in py.pkgs.buildPythonApplication rec { postPatch = '' for i in {py,cfg}; do - substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11" + substituteInPlace setup.$i --replace "botocore==1.10.65" "botocore>=1.10.9,<=1.11" done ''; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index b55ac457305b1..b1693bd262fee 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,7 +1,7 @@ -{ stdenv, python }: +{ stdenv, python3, glibcLocales }: let - localPython = python.override { + localPython = python3.override { packageOverrides = self: super: { cement = super.cement.overridePythonAttrs (oldAttrs: rec { version = "2.8.2"; @@ -61,6 +61,12 @@ in with localPython.pkgs; buildPythonApplication rec { sha256 = "128dgxyz2bgl3r4jdkbmjs280004bm0dwzln7p6ly3yjs2x37jl6"; }; + buildInputs = [ + glibcLocales + ]; + + LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest mock nose pathspec colorama requests docutils ];