Merge pull request #208143 from fabaff/plotnine-fix

python310Packages.mizani: 0.7.4 -> 0.8.1, python310Packages.plotnine: 0.9.0 -> 0.10.1

pkgs/development/python-modules/distrax/default.nix

@@ -6,7 +6,8 @@
 , chex
 , dm-haiku
 , pytestCheckHook
-, jaxlib }:
+, jaxlib
+}:
 
 buildPythonPackage rec {
   pname = "distrax";
@@ -53,5 +54,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/deepmind/distrax";
     license = licenses.asl20;
     maintainers = with maintainers; [ onny ];
+    # Broken on all platforms (starting 2022-07-27)
+    broken = true;
   };
 }

pkgs/development/python-modules/mizani/default.nix

@@ -7,12 +7,13 @@
 , pytestCheckHook
 , pythonOlder
 , scipy
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "mizani";
-  version = "0.7.4";
+  version = "0.8.1";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
@@ -20,9 +21,13 @@ buildPythonPackage rec {
     owner = "has2k1";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-oqbo/aQ5L1nQO8BvXH6/8PBPiWcv2m/LUjwow8+J90w=";
+    hash = "sha256-VE0M5/s8/XmmAe8EE/FcHBFGc9ppVWuYOYMuajQeZww=";
   };
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     matplotlib
     palettable
@@ -46,6 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Scales for Python";
     homepage = "https://github.com/has2k1/mizani";
+    changelog = "https://github.com/has2k1/mizani/releases/tag/v${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ samuela ];
   };

pkgs/development/python-modules/plotnine/default.nix

@@ -1,26 +1,36 @@
 { lib
-, fetchPypi
-, buildPythonPackage
-, matplotlib
-, scipy
-, patsy
-, pandas
-, statsmodels
-, pytestCheckHook
-, geopandas
-, scikit-misc
 , adjusttext
-, mizani }:
+, buildPythonPackage
+, fetchPypi
+, geopandas
+, matplotlib
+, mizani
+, pandas
+, patsy
+, pytestCheckHook
+, pythonOlder
+, scikit-misc
+, scipy
+, setuptools-scm
+, statsmodels
+}:
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.9.0";
+  version = "0.10.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo=";
+    hash = "sha256-2RKgS2ONz4IsUaZ4i4VmQjI0jVFfFR2zpkwAAZZvaEE=";
   };
 
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace " --cov=plotnine --cov-report=xml" ""
@@ -69,7 +79,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Grammar of graphics for python";
-    homepage = "https://plotnine.readthedocs.io/en/stable";
+    homepage = "https://plotnine.readthedocs.io/";
+    changelog = "https://github.com/has2k1/plotnine/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ onny ];
   };

pkgs/development/python-modules/statsmodels/default.nix

@@ -1,38 +1,53 @@
 { lib
 , buildPythonPackage
+, cython
 , fetchPypi
-, isPy27
+, matplotlib
-, nose
 , numpy
-, scipy
 , pandas
 , patsy
-, cython
+, pythonOlder
-, matplotlib
+, scipy
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "statsmodels";
-  version = "0.13.4";
+  version = "0.13.5";
-  disabled = isPy27;
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-juXRtp9kvA6TeWZ0Ve41hYSdXmvNPz5I5Yumytrf6tU=";
+    hash = "sha256-WTUmrK4cD9oOpsSEOfZ8OUMJTFQv52n4uQ/p5sbMSHE=";
   };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
-  checkInputs = [ nose ];
+    cython
-  propagatedBuildInputs = [ numpy scipy pandas patsy matplotlib ];
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+    pandas
+    patsy
+    matplotlib
+  ];
 
   # Huge test suites with several test failures
   doCheck = false;
-  pythonImportsCheck = [ "statsmodels" ];
 
-  meta = {
+  pythonImportsCheck = [
+    "statsmodels"
+  ];
+
+  meta = with lib; {
     description = "Statistical computations and models for use with SciPy";
     homepage = "https://www.github.com/statsmodels/statsmodels";
-    license = lib.licenses.bsd3;
+    changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}";
-    maintainers = with lib.maintainers; [ fridh ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
   };
 }