about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-12-30 20:13:49 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-01-05 13:20:36 +0100
commite9c7c8cd48b02176dcffd53a4991e51ed3700c46 (patch)
tree7f3e239d64a08f70fb47efde3fce4d3c1a901c49
parent539f174c28346323df925c65fcda7cea866c832e (diff)
python3Packages.srsly: 2.4.4 -> 2.4.5
-rw-r--r--pkgs/development/python-modules/sly/default.nix25
-rw-r--r--pkgs/development/python-modules/srsly/default.nix24
2 files changed, 39 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix
index b13c41be7276c..411bc3e9297e8 100644
--- a/pkgs/development/python-modules/sly/default.nix
+++ b/pkgs/development/python-modules/sly/default.nix
@@ -1,24 +1,39 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytest
+, setuptools
+, pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "sly";
   version = "0.5";
+  format = "pyproject";
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ=";
+    hash = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ=";
   };
 
-  checkInputs = [ pytest ];
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  postPatch = ''
+    # imperative dev dependency installation
+    rm Makefile
+  '';
+
+  pythonImportsCheck = [
+    "sly"
+  ];
 
-  # tests not included with pypi release
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "An improved PLY implementation of lex and yacc for Python 3";
diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 5108f9ea5eaad..8dd111b0797ca 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -6,35 +6,49 @@
 , catalogue
 , mock
 , numpy
+, psutil
 , pytest
 , ruamel-yaml
+, setuptools
+, tornado
 }:
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "2.4.4";
+  version = "2.4.5";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg=";
+    hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c=";
   };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
+    cython
+    setuptools
+  ];
 
-  propagatedBuildInputs = [ catalogue ];
+  propagatedBuildInputs = [
+    catalogue
+  ];
 
   checkInputs = [
     mock
     numpy
+    psutil
     pytest
     ruamel-yaml
+    tornado
   ];
 
-  pythonImportsCheck = [ "srsly" ];
+  pythonImportsCheck = [
+    "srsly"
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/explosion/srsly/releases/tag/v${version}";
     description = "Modern high-performance serialization utilities for Python";
     homepage = "https://github.com/explosion/srsly";
     license = licenses.mit;