diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 14:49:25 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 14:49:25 +0200 |
commit | e73f8712851f6905f82c84daef1d2bb75b0c95c1 (patch) | |
tree | 0c60ad92ba4283fb413cddaceecf7f26e6b5345d /pkgs/development/python-modules | |
parent | 9fcdb3bd168213ad8cafbae9bfab44bc01b73933 (diff) | |
parent | 362c2f67f9e24771f6634cec90111ab7992b5cfa (diff) | |
download | nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.tar nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.tar.gz nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.tar.bz2 nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.tar.lz nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.tar.xz nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.tar.zst nixlib-e73f8712851f6905f82c84daef1d2bb75b0c95c1.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules')
6 files changed, 68 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index f92f8004ac00..b877c4cabd5f 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + ln -s $HOME/.config/matplotlib $HOME/.matplotlib - # disable matplotlib tests on darwin, because it requires a framework build of Python - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=colorcet/tests/test_matplotlib.py"} colorcet + pytest colorcet ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 8b60155b50a0..cfe0b89b92bf 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.23"; + version = "1.11.24"; src = fetchurl { url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj"; + sha256 = "1qw97zcsnbnn9dqad1kps48vfaifdkvqb8c3vld6nnvp7x2jfp11"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index d517af949d47..e95d1aaba022 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -45,6 +45,10 @@ buildPythonPackage rec { funcsigs ]; + postPatch = '' + sed -i s/pyyaml==3.12/pyyaml==${pyyaml.version}/ setup.cfg setup.py + ''; + meta = with stdenv.lib; { homepage = https://github.com/elastic/curator; description = "Curate, or manage, your Elasticsearch indices and snapshots"; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 37ba58977e15..edf0450366c5 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -26,13 +26,11 @@ buildPythonPackage rec { pytest ]; - # disable tests on darwin, because it requires a framework build of Python - doCheck = !stdenv.isDarwin; - checkPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + ln -s $HOME/.config/matplotlib $HOME/.matplotlib pytest ''; diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix new file mode 100644 index 000000000000..0bd7b0ca686c --- /dev/null +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonPackages }: + +buildPythonPackage rec { + pname = "rfc6555"; + version = "0.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r"; + }; + + propagatedBuildInputs = with pythonPackages; [ selectors2 ]; + + checkInputs = with pythonPackages; [ mock pytest ]; + # disabling tests that require a functional DNS IPv{4,6} stack to pass. + patches = [ ./disable_network_tests.patch ]; + # default doCheck = true; is not enough, apparently + postCheck = '' + py.test tests/ + ''; + + meta = { + description = "Python implementation of the Happy Eyeballs Algorithm"; + homepage = "https://pypi.org/project/rfc6555"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ endocrimes ]; + }; +} diff --git a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/pkgs/development/python-modules/rfc6555/disable_network_tests.patch new file mode 100644 index 000000000000..dc59111ac43f --- /dev/null +++ b/pkgs/development/python-modules/rfc6555/disable_network_tests.patch @@ -0,0 +1,31 @@ +diff --git a/tests/test_create_connection.py b/tests/test_create_connection.py +index fe38026..cdb26b4 100644 +--- a/tests/test_create_connection.py ++++ b/tests/test_create_connection.py +@@ -6,10 +6,12 @@ from .test_utils import requires_network + + + class _BasicCreateConnectionTests(object): ++ + @requires_network + def test_create_connection_google(self): + sock = rfc6555.create_connection(('www.google.com', 80)) + ++ @requires_network + @pytest.mark.parametrize('timeout', [None, 5.0]) + def test_create_connection_has_proper_timeout(self, timeout): + sock = rfc6555.create_connection(('www.google.com', 80), timeout=timeout) +diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py +index 3ee8564..f0db28e 100644 +--- a/tests/test_ipv6.py ++++ b/tests/test_ipv6.py +@@ -2,7 +2,9 @@ import socket + import mock + import rfc6555 + ++from .test_utils import requires_network + ++@requires_network + def test_ipv6_available(): + assert rfc6555._detect_ipv6() + |