From 881d6a9e646e41adc1d7a8a72b39afa53bdaeb3c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jan 2018 09:00:42 +0100 Subject: [PATCH] python: jupyter_client: 5.2.0 -> 5.2.1 --- .../python-modules/jupyter_client/default.nix | 8 ++------ .../jupyter_client/wheel_workaround.patch | 13 ------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/python-modules/jupyter_client/wheel_workaround.patch diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index e88b7f937a55..42d7752eda3b 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "ca30cf1786047925ebacd6f6faa3a993efaa004b584f7d83bc8b807f7cd3f6bb"; + sha256 = "462790d46b244f0a631ea5e3cd5cdbad6874d5d24cc0ff512deb7c16cdf8653d"; }; checkInputs = [ ipykernel ipython mock pytest ]; @@ -29,10 +29,6 @@ buildPythonPackage rec { py.test ''; - patches = [ - ./wheel_workaround.patch - ]; - # Circular dependency with ipykernel doCheck = false; diff --git a/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch deleted file mode 100644 index 926fcb26448b..000000000000 --- a/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 95d4774..ee72cbc 100644 ---- a/setup.py -+++ b/setup.py -@@ -86,7 +86,7 @@ setup_args = dict( - extras_require = { - 'test': ['ipykernel', 'ipython', 'mock'], - 'test:python_version == "3.3"': ['pytest<3.3.0'], -- 'test:python_version >= "3.4" or python_version == "2.7"': ['pytest'], -+ 'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'], - }, - cmdclass = { - 'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled,