Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python packages fixes #45792

Merged
merged 41 commits into from
Sep 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4e93723
python: absl-py: 0.4.0 -> 0.4.1
FRidh Aug 30, 2018
5bdb67a
python: aws-adfs: 0.12.0 -> 0.12.1
FRidh Aug 30, 2018
7b9d1f0
python: botocore: 1.11.1 -> 1.11.4
FRidh Aug 30, 2018
ef6f34a
python: deform: 2.0.5 -> 2.0.6
FRidh Aug 30, 2018
489e2e2
python: dftfit: 0.4.11 -> 0.4.22
FRidh Aug 30, 2018
cdb439d
python: Faker: 0.8.17 -> 0.8.18
FRidh Aug 30, 2018
aee2b9e
python: joblib: 0.12.2 -> 0.12.3
FRidh Aug 30, 2018
bd05a04
python: jupyterlab: 0.34.2 -> 0.34.6
FRidh Aug 30, 2018
5166335
python: moto: 1.3.4 -> 1.3.5
FRidh Aug 30, 2018
00be835
python: openpyxl: 2.5.5 -> 2.5.6
FRidh Aug 30, 2018
73dd7f6
python: persistent: 4.4.1 -> 4.4.2
FRidh Aug 30, 2018
7aed1c8
python: phonenumbers: 8.9.11 -> 8.9.12
FRidh Aug 30, 2018
7def229
python: pytest: 3.7.2 -> 3.7.4
FRidh Aug 30, 2018
fb209cb
python: pytest-timeout: 1.3.1 -> 1.3.2
FRidh Aug 30, 2018
6c138a3
python: regex: 2018.08.17 -> 2018.08.29
FRidh Aug 30, 2018
748d5c6
python: sockjs-tornado: 1.0.3 -> 1.0.5
FRidh Aug 30, 2018
0a867ac
python: Sphinx: 1.7.7 -> 1.7.8
FRidh Aug 30, 2018
e614af6
python: typing: 3.6.4 -> 3.6.6
FRidh Aug 30, 2018
427eb5f
python: XlsxWriter: 1.0.7 -> 1.0.9
FRidh Aug 30, 2018
6e45d0a
pythonPackages.boto3: 1.7.57 -> 1.7.84
FRidh Aug 30, 2018
bed1028
pythonPackages.folium: add missing numpy runtime dependency
FRidh Aug 30, 2018
5cd7db4
pythonPackages.pytestrunner: failed attempt at enabling tests
FRidh Aug 30, 2018
dce0310
python.pkgs.sarge: disable tests
Aug 30, 2018
0376279
pythonPackages.boto3: 1.7.84 -> 1.8.4
FRidh Aug 30, 2018
678ad5b
awscli: 1.16.1 -> 1.16.4
FRidh Aug 30, 2018
bf98ea8
pythonPackages.cement: disable Python 2
FRidh Aug 30, 2018
b07a57b
Revert "python: shippai: 0.2.3 -> 0.3.1"
FRidh Aug 30, 2018
f39f7c9
Revert "python.pkgs.python-jose: 2.0.2 -> 3.0.0"
FRidh Aug 30, 2018
5110f1b
pythonPackages.scipy: disable tests
FRidh Aug 30, 2018
d64dbeb
Python: fix botocore/boto3/awscli mess
FRidh Aug 30, 2018
717bb0f
pythonPackages.moto: fix build
FRidh Aug 30, 2018
0227d82
pythonPackages.cmd2: fix build
FRidh Aug 30, 2018
053e42f
awsebcli: use python3
Aug 30, 2018
acc1f78
pythonPackages.bottleneck: get rid of warnings during tests
FRidh Aug 30, 2018
c7360a8
python.pkgs.keyrings-alt: fix tests
Aug 30, 2018
7b67497
python.pkgs.celery: fix tests
Aug 30, 2018
b3ff910
python.pkgs.cairocffi: remove superfluous patch
Aug 30, 2018
1736959
octoprint: pin pylru to 1.0.9
Aug 30, 2018
83e358a
python.pkgs.natsort: no pyflakes and pep8 checks
Aug 30, 2018
0bb57d4
python.pkgs.h5py: disable tests
Aug 30, 2018
2a89902
pythonPackages.pandas: fix build
FRidh Sep 1, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/applications/misc/octoprint/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
});
};
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/XlsxWriter/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/absl-py/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/aws-adfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/boto3/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
6 changes: 2 additions & 4 deletions pkgs/development/python-modules/botocore/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -25,7 +24,6 @@ buildPythonPackage rec {
docutils
ordereddict
simplejson
urllib3
];

checkInputs = [ mock nose ];
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/bottleneck/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ buildPythonPackage
, fetchPypi
, nose
, pytest
, numpy
, python
}:
Expand All @@ -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" ""
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/development/python-modules/cairocffi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/celery/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/cement/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi }:
{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:

buildPythonPackage rec {
pname = "cement";
Expand All @@ -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.";
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/python-modules/cmd2/default.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -31,6 +31,10 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
disabled = !isPy3k;

buildInputs = [
setuptools_scm
];

propagatedBuildInputs = [
colorama
pyperclip
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/deform/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dftfit/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/faker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/folium/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/h5py/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/joblib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jupyterlab/default.nix
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
9 changes: 6 additions & 3 deletions pkgs/development/python-modules/keyrings-alt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/moto/default.nix
Original file line number Diff line number Diff line change
@@ -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 = ''
Expand Down Expand Up @@ -42,6 +42,7 @@ buildPythonPackage rec {
botocore
docker
responses
python-jose
];

checkInputs = [ boto3 nose sure freezegun ];
Expand Down
6 changes: 1 addition & 5 deletions pkgs/development/python-modules/natsort/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
, fetchPypi
, hypothesis
, pytestcache
, pytestflakes
, pytestpep8
, pytest
, glibcLocales
, mock ? null
Expand All @@ -19,8 +17,6 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
pytestcache
pytestflakes
pytestpep8
pytest
glibcLocales
]
Expand All @@ -37,7 +33,7 @@ buildPythonPackage rec {
# testing based on project's tox.ini
checkPhase = ''
pytest --doctest-modules natsort
pytest --flakes --pep8
pytest
'';

meta = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/openpyxl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pandas/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/persistent/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Loading