From 4ddd5e48b7007128e8abe32fee65e4fdd708ef67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Mar 2023 18:51:18 -0700 Subject: [PATCH 1/5] python310Packages.etils: 1.0.0 -> 1.1.0 Changelog: https://github.com/google/etils/blob/v1.1.0/CHANGELOG.md --- pkgs/development/python-modules/etils/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index bcb47a4fac70..31dd7cac40fa 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; From 62501a21e890f9b62cf2095d4ab0601ce7820ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Mar 2023 19:01:02 -0700 Subject: [PATCH 2/5] python310Packages.testcontainers: fix build --- pkgs/development/python-modules/testcontainers/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 4a3c41009850..4da0d7702317 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 From 79700ec6ed926fd1db76fec445d6d6c7d3ea83cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Mar 2023 19:21:16 -0700 Subject: [PATCH 3/5] python310Packages.tables: remove cython from requirements.txt Transitive dependencies should not require Cython. --- pkgs/development/python-modules/tables/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index c2a2cd5e11a8..cb6670c785db 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" ''; From f6b69b23c91ffc05b8a69162a4f68e9625ecca6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Mar 2023 20:02:55 -0700 Subject: [PATCH 4/5] python310Packages.blosc2: remove pytest from runtime-requirements.txt Transitive dependencies should not require pytest. --- pkgs/development/python-modules/blosc2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 027dd0ca8e19..87f23b04dcf0 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 From 1c1e0891cc5d7a013370f9480a8e99ed501f82f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Mar 2023 23:11:11 -0700 Subject: [PATCH 5/5] python310Packages.scooby: fix build --- pkgs/development/python-modules/scooby/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 0bd037a74fc7..ba9049e3ac7a 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 = [