From cf62881636d0269ffa7c35edbaca9738285d7e12 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:21:44 -0500 Subject: [PATCH 01/10] pythonPackages.streamz: init at 0.5.0 --- .../python-modules/streamz/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/streamz/default.nix diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix new file mode 100644 index 00000000000..b23853a9bae --- /dev/null +++ b/pkgs/development/python-modules/streamz/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tornado +, toolz +, zict +, six +, pytest +, networkx +, distributed +, confluent-kafka +, graphviz +}: + +buildPythonPackage rec { + pname = "streamz"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "cfdd42aa62df299f550768de5002ec83112136a34b44441db9d633b2df802fb4"; + }; + + checkInputs = [ pytest networkx distributed confluent-kafka graphviz ]; + propagatedBuildInputs = [ + tornado + toolz + zict + six + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pipelines to manage continuous streams of data"; + homepage = http://github.com/mrocklin/streamz/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd3f589fa30..11ab29088f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4168,6 +4168,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + streamz = callPackage ../development/python-modules/streamz { }; + structlog = callPackage ../development/python-modules/structlog { }; sybil = callPackage ../development/python-modules/sybil { }; From 5b3d8888f710729c346746e922c0ccc3ee4386d8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:22:24 -0500 Subject: [PATCH 02/10] pythonPackages.pyviz-comms: init at 0.7.0 --- .../python-modules/pyviz-comms/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pyviz-comms/default.nix diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix new file mode 100644 index 00000000000..53f06cff922 --- /dev/null +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +, param +}: + +buildPythonPackage rec { + pname = "pyviz_comms"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7ad4ff0c2166f0296ee070049ce21341f868f907003714eb6eaf1630ea8e241a"; + }; + + propagatedBuildInputs = [ param ]; + + # there are not tests with the package + doCheck = false; + + meta = with lib; { + description = "Launch jobs, organize the output, and dissect the results"; + homepage = http://pyviz.org/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11ab29088f0..77d4a507036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3568,6 +3568,8 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pillow = callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; From 19df1a4f294bc9756446951e1b849bbf5aae0763 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:22:51 -0500 Subject: [PATCH 03/10] pythonPackages.python-snappy: init at 0.5.3 --- .../python-modules/python-snappy/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/python-snappy/default.nix diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix new file mode 100644 index 00000000000..4615bfcccce --- /dev/null +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, snappy +, cffi +, nose +}: + +buildPythonPackage rec { + pname = "python-snappy"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8a7f803f06083d4106d55387d2daa32c12b5e376c3616b0e2da8b8a87a27d74a"; + }; + + buildInputs = [ snappy ]; + + propagatedBuildInputs = lib.optional isPyPy cffi; + + checkInputs = [ nose ]; + + checkPhase = '' + rm -r snappy # prevent local snappy from being picked up + nosetests test_snappy.py + '' + lib.optionalString isPyPy '' + nosetests test_snappy_cffi.py + ''; + + meta = with lib; { + description = "Python library for the snappy compression library from Google"; + homepage = http://github.com/andrix/python-snappy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77d4a507036..105cde088f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -754,6 +754,10 @@ in { python-sql = callPackage ../development/python-modules/python-sql { }; + python-snappy = callPackage ../development/python-modules/python-snappy { + inherit (pkgs) snappy; + }; + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; python-socketio = callPackage ../development/python-modules/python-socketio { }; From 1a2eae56107cbce37cdad9b7cd6178957e9bab7e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:23:15 -0500 Subject: [PATCH 04/10] pythonPackages.pyct: init at 0.4.6 --- .../python-modules/pyct/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pyct/default.nix diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix new file mode 100644 index 00000000000..fc61d689329 --- /dev/null +++ b/pkgs/development/python-modules/pyct/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, param +, pyyaml +, requests +, pytest +}: + +buildPythonPackage rec { + pname = "pyct"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "df7b2d29f874cabdbc22e4f8cba2ceb895c48aa33da4e0fe679e89873e0a4c6e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + param + pyyaml + requests + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Cli for python common tasks for users"; + homepage = https://github.com/pyviz/pyct; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 105cde088f7..b3ce84b6349 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3679,6 +3679,8 @@ in { pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + pyct = callPackage ../development/python-modules/pyct { }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl = callPackage ../development/python-modules/pycurl { }; From 7242b9e02c57d693b10f3eb5d7f03bcc2edd4813 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:23:33 -0500 Subject: [PATCH 05/10] pythonPackages.holoviews: init at 1.11.2 --- .../python-modules/holoviews/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/holoviews/default.nix diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix new file mode 100644 index 00000000000..ea8885def3e --- /dev/null +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -0,0 +1,47 @@ +{ buildPythonPackage +, fetchPypi +, lib +, param +, numpy +, pyviz-comms +, ipython +, notebook +, pandas +, matplotlib +, bokeh +, scipy +, panel +}: + +buildPythonPackage rec { + pname = "holoviews"; + version = "1.11.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0902wzzz73ikkdy0jfhg1lx97y1gk7v1nr3d3jqqdfzaa7bmhqwj"; + }; + + propagatedBuildInputs = [ + param + numpy + pyviz-comms + ipython + notebook + pandas + matplotlib + bokeh + scipy + panel + ]; + + # tests not fully included with pypi release + doCheck = false; + + meta = with lib; { + description = "Python data analysis and visualization seamless and simple"; + homepage = http://www.holoviews.org/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3ce84b6349..883c36f49fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -438,6 +438,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + holoviews = callPackage ../development/python-modules/holoviews { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); From 751fdd8ae6075698efe1b7aa3eb3580f5de4e1a9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:23:55 -0500 Subject: [PATCH 06/10] pythonPackages.intake: init at 0.4.1 --- .../python-modules/intake/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/intake/default.nix diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix new file mode 100644 index 00000000000..4434ea0edc1 --- /dev/null +++ b/pkgs/development/python-modules/intake/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, dask +, holoviews +, jinja2 +, msgpack-numpy +, msgpack-python +, numpy +, pandas +, python-snappy +, requests +, ruamel_yaml +, six +, tornado +, pytest +, pythonOlder +, isPy27 +}: + +buildPythonPackage rec { + pname = "intake"; + version = "0.4.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "f47e53aa764eeadf6adcc667b9817b1ad32496477476da0b982d4fc0744b40ef"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + appdirs + dask + holoviews + jinja2 + msgpack-numpy + msgpack-python + numpy + pandas + python-snappy + requests + ruamel_yaml + six + tornado + ]; + + checkPhase = '' + # single test assumes python for executable name + PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest --ignore=intake/catalog/tests/test_default.py + ''; + + meta = with lib; { + description = "Data load and catalog system"; + homepage = https://github.com/ContinuumIO/intake; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 883c36f49fe..8e4e639a732 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -452,6 +452,8 @@ in { imutils = callPackage ../development/python-modules/imutils { }; + intake = callPackage ../development/python-modules/intake { }; + intelhex = callPackage ../development/python-modules/intelhex { }; jira = callPackage ../development/python-modules/jira { }; From 0bf877b23a5fb14868cd2aaab174d79fa59ea02e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:24:17 -0500 Subject: [PATCH 07/10] pythonPackages.nbsmoke: init at 0.2.7 --- .../python-modules/nbsmoke/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/nbsmoke/default.nix diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix new file mode 100644 index 00000000000..2816315f105 --- /dev/null +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jupyter_client +, ipykernel +, nbformat +, nbconvert +, pyflakes +, requests +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "nbsmoke"; + version = "0.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "40891e556dc9e252da2a649028cacb949fc8efb81062ada7d9a87a01b08bb454"; + }; + + propagatedBuildInputs = [ + pytest + jupyter_client + ipykernel + nbformat + nbconvert + pyflakes + requests + beautifulsoup4 + ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "Basic notebook checks and linting"; + homepage = https://github.com/pyviz/nbsmoke; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e4e639a732..b6125f00653 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -498,6 +498,8 @@ in { nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; nbval = callPackage ../development/python-modules/nbval { }; From 5785c2c5ba91823a379db68519bf910ac5fee6d4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:24:42 -0500 Subject: [PATCH 08/10] pythonPackages.panel: init at 0.4.0 --- .../python-modules/panel/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/panel/default.nix diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix new file mode 100644 index 00000000000..821a543eeb1 --- /dev/null +++ b/pkgs/development/python-modules/panel/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bokeh +, param +, pyviz-comms +, markdown +, pyct +, testpath +, pytest +, scipy +, plotly +, altair +, vega_datasets +, hvplot +}: + +buildPythonPackage rec { + pname = "panel"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "testpath<0.4" "testpath" + ''; + + propagatedBuildInputs = [ + bokeh + param + pyviz-comms + markdown + pyct + testpath + ]; + + # infinite recursion in test dependencies (hvplot) + doCheck = false; + + meta = with lib; { + description = "A high level dashboarding library for python visualization libraries"; + homepage = http://pyviz.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6125f00653..5a7a8dc797e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3462,6 +3462,8 @@ in { pandas = callPackage ../development/python-modules/pandas { }; + panel = callPackage ../development/python-modules/panel { }; + xlrd = callPackage ../development/python-modules/xlrd { }; bottleneck = callPackage ../development/python-modules/bottleneck { }; From 3c3bf6450c5617f005c602d799983df11ea080ef Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:26:24 -0500 Subject: [PATCH 09/10] pythonPackages.param: init at 1.8.2 --- .../python-modules/param/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/param/default.nix diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix new file mode 100644 index 00000000000..69a2e61e269 --- /dev/null +++ b/pkgs/development/python-modules/param/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, nose +}: + +buildPythonPackage rec { + pname = "param"; + version = "1.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01"; + }; + + checkInputs = [ flake8 nose ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "Declarative Python programming using Parameters"; + homepage = https://github.com/pyviz/param; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a7a8dc797e..0cf538383eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3474,6 +3474,8 @@ in { parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + param = callPackage ../development/python-modules/param { }; + paramiko = callPackage ../development/python-modules/paramiko { }; parameterized = callPackage ../development/python-modules/parameterized { }; From f6719efd836c70946ef6b8e161368396daede453 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 24 Feb 2019 10:26:44 -0500 Subject: [PATCH 10/10] pythonPackages.hvplot: init at 0.4.0 --- .../python-modules/hvplot/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/hvplot/default.nix diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix new file mode 100644 index 00000000000..dfec9ffc200 --- /dev/null +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bokeh +, holoviews +, pandas +, pytest +, parameterized +, nbsmoke +, flake8 +, coveralls +, xarray +, networkx +, streamz +}: + +buildPythonPackage rec { + pname = "hvplot"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bce169cf2d1b3ff9ce607d1787f608758e72a498434eaa2bece31eea1f51963a"; + }; + + checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; + propagatedBuildInputs = [ + bokeh + holoviews + pandas + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # many tests require a network connection + doCheck = false; + + meta = with lib; { + description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; + homepage = https://hvplot.pyviz.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cf538383eb..6ed1819370d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4164,6 +4164,8 @@ in { hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hvplot = callPackage ../development/python-modules/hvplot { }; + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };