diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 8d7ec25da838..b7fbcb552746 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -17,7 +17,7 @@ , anywidget , ipython , pytestCheckHook -, vega_datasets +, vega-datasets , sphinx }: @@ -51,7 +51,7 @@ buildPythonPackage rec { anywidget ipython sphinx - vega_datasets + vega-datasets pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 5d051ef80ec2..19474d8d9fbf 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -48,7 +48,7 @@ , torch , tqdm , transformers -, vega_datasets +, vega-datasets }: buildPythonPackage rec { @@ -118,7 +118,7 @@ buildPythonPackage rec { torch tqdm transformers - vega_datasets + vega-datasets ]; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). diff --git a/pkgs/development/python-modules/vega-datasets/default.nix b/pkgs/development/python-modules/vega-datasets/default.nix new file mode 100644 index 000000000000..e0c9133767fc --- /dev/null +++ b/pkgs/development/python-modules/vega-datasets/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "vega-datasets"; + version = "0.9.0"; + pyproject = true; + + src = fetchPypi { + pname = "vega_datasets"; + inherit version; + hash = "sha256-nb6YNCCOjsMqtElw3zFd6RAoYeTNoT2OFDqreoDZP8A="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ pandas ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "--doctest-modules" + ]; + + pythonImportsCheck = [ + "vega_datasets" + ]; + + meta = with lib; let + tag = removeSuffix ".0" "v${version}"; + in { + description = "A Python package for offline access to vega datasets"; + homepage = "https://github.com/altair-viz/vega_datasets"; + changelog = "https://github.com/altair-viz/vega_datasets/blob/${tag}/CHANGES.md"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix deleted file mode 100644 index 629f5407437c..000000000000 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pandas, pytest }: - -buildPythonPackage rec { - pname = "vega_datasets"; - version = "0.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0"; - }; - - propagatedBuildInputs = [ pandas ]; - - nativeCheckInputs = [ pytest ]; - - checkPhase = '' - py.test vega_datasets --doctest-modules -k 'not column_names' - ''; - - meta = with lib; { - description = "A Python package for offline access to vega datasets"; - homepage = "https://github.com/altair-viz/vega_datasets"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b631ee4cf9f8..39577ac30411 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -422,6 +422,7 @@ mapAliases ({ uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07 + vega_datasets = vega-datasets; # added 2023-11-04 ViennaRNA = viennarna; # added 2023-08-23 virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 Wand = wand; # added 2022-11-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5639ff919b94..0bd217ad4ee1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15373,7 +15373,7 @@ self: super: with self; { vega = callPackage ../development/python-modules/vega { }; - vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + vega-datasets = callPackage ../development/python-modules/vega-datasets { }; venstarcolortouch = callPackage ../development/python-modules/venstarcolortouch { };