Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b381c27b589c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7455307b608f
Choose a head ref
  • 11 commits
  • 11 files changed
  • 2 contributors

Commits on Feb 24, 2019

  1. Copy the full SHA
    cf62881 View commit details
  2. Copy the full SHA
    5b3d888 View commit details
  3. Copy the full SHA
    19df1a4 View commit details
  4. Copy the full SHA
    1a2eae5 View commit details
  5. Copy the full SHA
    7242b9e View commit details
  6. Copy the full SHA
    751fdd8 View commit details
  7. Copy the full SHA
    0bf877b View commit details
  8. Copy the full SHA
    5785c2c View commit details
  9. Copy the full SHA
    3c3bf64 View commit details
  10. Copy the full SHA
    f6719ef View commit details

Commits on Mar 1, 2019

  1. Merge pull request #56303 from costrouc/python-intake-init

    Initialize python pyviz stack and intake
    dotlambda authored Mar 1, 2019
    Copy the full SHA
    7455307 View commit details
47 changes: 47 additions & 0 deletions pkgs/development/python-modules/holoviews/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
46 changes: 46 additions & 0 deletions pkgs/development/python-modules/hvplot/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
60 changes: 60 additions & 0 deletions pkgs/development/python-modules/intake/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
43 changes: 43 additions & 0 deletions pkgs/development/python-modules/nbsmoke/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
50 changes: 50 additions & 0 deletions pkgs/development/python-modules/panel/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/param/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
36 changes: 36 additions & 0 deletions pkgs/development/python-modules/pyct/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
39 changes: 39 additions & 0 deletions pkgs/development/python-modules/python-snappy/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/pyviz-comms/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
Loading