diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 92ced96774e0..4e985885890a 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -13,22 +12,20 @@ pandas, scipy, - # checks + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "mizani"; - version = "0.12.2"; + version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8="; + hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index f94ac77898f3..a402babb71bc 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - geopandas, + + # build-system + setuptools-scm, + + # dependencies matplotlib, mizani, pandas, patsy, - pytestCheckHook, - pythonOlder, - scikit-misc, scipy, - setuptools-scm, statsmodels, + + # tests + geopandas, + pytestCheckHook, + scikit-misc, }: buildPythonPackage rec { pname = "plotnine"; - version = "0.13.6"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg="; + hash = "sha256-4x7euxf+G/HaqC3LVD7TCQEVcihdb/FSMqRvMWAqhgo="; }; postPatch = '' @@ -36,8 +39,6 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - pythonRelaxDeps = [ "mizani" ]; - dependencies = [ matplotlib mizani