Merge pull request #221432 from dotlambda/etils-1.1.0

python310Packages.etils: 1.0.0 -> 1.1.0

5 files changed, 24 insertions, 7 deletions

diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index 027dd0ca8e19f..87f23b04dcf00 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -35,6 +35,11 @@ buildPythonPackage rec {
     hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements-runtime.txt \
+      --replace "pytest" ""
+  '';
+
   nativeBuildInputs = [
     cmake
     cython
diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index bcb47a4fac709..31dd7cac40fae 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "etils";
-  version = "1.0.0";
+  version = "1.1.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0QmC93AkIr6oY11ShLi+1in1GRn8EirB4eSr9F7I94U=";
+    hash = "sha256-eipJUHeaKB70x+WVriFZkLFcHYxviwonhQCSr1rSxkE=";
   };
 
   nativeBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
 
   passthru.optional-dependencies = rec {
     array-types = enp;
+    eapp = [ absl-py /* FIXME package simple-parsing */ ] ++ epy;
     ecolab = [ jupyter numpy mediapy ] ++ enp ++ epy;
     edc = epy;
     enp = [ numpy ] ++ epy;
@@ -53,8 +54,8 @@ buildPythonPackage rec {
     etree = array-types ++ epy ++ enp ++ etqdm;
     etree-dm = [ dm-tree ] ++ etree;
     etree-jax = [ jax ] ++ etree;
-    etree-tf = [ tensorflow etree ] ++ etree;
-    all = array-types ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm
+    etree-tf = [ tensorflow ] ++ etree;
+    all = array-types ++ eapp ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm
       ++ etree ++ etree-dm ++ etree-jax ++ etree-tf;
   };
 
@@ -73,14 +74,13 @@ buildPythonPackage rec {
   ++ passthru.optional-dependencies.all;
 
   disabledTests = [
-    "test_repr" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143
     "test_public_access" # requires network access
-    "test_resource_path" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143
   ];
 
   doCheck = false; # error: infinite recursion encountered
 
   meta = with lib; {
+    changelog = "https://github.com/google/etils/blob/v${version}/CHANGELOG.md";
     description = "Collection of eclectic utils for python";
     homepage = "https://github.com/google/etils";
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index 0bd037a74fc7a..ba9049e3ac7a6 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "python_requires='>=3.7.*'" "python_requires='>=3.7'"
+  '';
+
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index c2a2cd5e11a81..cb6670c785db6 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -55,6 +55,7 @@ buildPythonPackage rec {
       --replace "return 0" "assert result.wasSuccessful(); return 0" \
       --replace "return 1" "assert result.wasSuccessful(); return 1"
     substituteInPlace requirements.txt \
+      --replace "cython>=0.29.21" "" \
       --replace "blosc2~=2.0.0" "blosc2"
   '';
 
diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix
index 4a3c410098507..4da0d7702317a 100644
--- a/pkgs/development/python-modules/testcontainers/default.nix
+++ b/pkgs/development/python-modules/testcontainers/default.nix
@@ -9,6 +9,8 @@ buildPythonPackage rec {
   pname = "testcontainers";
   version = "3.7.1";
 
+  format = "setuptools";
+
   src = fetchFromGitHub {
     owner = "testcontainers";
     repo = "testcontainers-python";
@@ -16,6 +18,10 @@ buildPythonPackage rec {
     hash = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM=";
   };
 
+  postPatch = ''
+    echo "${version}" > VERSION
+  '';
+
   buildInputs = [
     deprecation
     docker