diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-30 12:23:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-31 11:01:56 +0100 |
| commit | d170941f6e72b3d7a079cdbda128aa2feea55b18 (patch) | |
| tree | c7c1997686a33ca10ef875d577ec38d0513a8fbc /pkgs/development/python-modules/jupyter_client | |
| parent | b3aa977bbf02c90dc11bd61174d0eb2679fbf8a5 (diff) | |
| download | nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.tar nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.tar.gz nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.tar.bz2 nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.tar.lz nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.tar.xz nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.tar.zst nixpkgs-d170941f6e72b3d7a079cdbda128aa2feea55b18.zip | |
python: jupyter_client: 5.1.0 -> 5.2.0
Diffstat (limited to 'pkgs/development/python-modules/jupyter_client')
| -rw-r--r-- | pkgs/development/python-modules/jupyter_client/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/python-modules/jupyter_client/wheel_workaround.patch | 13 |
2 files changed, 25 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 3782d313df8..e88b7f937a5 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, nose , traitlets , jupyter_core , pyzmq , dateutil , isPyPy , py +, ipykernel +, ipython +, mock +, pytest }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.1.0"; - name = "${pname}-${version}"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba"; + sha256 = "ca30cf1786047925ebacd6f6faa3a993efaa004b584f7d83bc8b807f7cd3f6bb"; }; - buildInputs = [ nose ]; + checkInputs = [ ipykernel ipython mock pytest ]; propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; checkPhase = '' - nosetests -v + 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 new file mode 100644 index 00000000000..926fcb26448 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch @@ -0,0 +1,13 @@ +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, |