From c1668191afd9a2e55bb6df823c7b9ad2bffa8fc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jun 2023 22:40:23 +0200 Subject: [PATCH 1/6] python311Packages.typer: 0.7.0 -> 0.9.0 Changelog: https://github.com/tiangolo/typer/releases/tag/0.9.0 --- .../python-modules/typer/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index f02a0f0c5139..eaec338f44b7 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -1,43 +1,40 @@ { lib , stdenv , buildPythonPackage +, click , colorama +, coverage , fetchpatch , fetchPypi , flit-core -, click +, pytest-sugar +, pytest-xdist , pytestCheckHook +, pythonOlder , rich , shellingham -, pytest-xdist -, pytest-sugar -, coverage -, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "typer"; - version = "0.7.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU="; + hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "rich >=10.11.0,<13.0.0" "rich" - ''; - nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ click + typing-extensions ]; passthru.optional-dependencies = { @@ -58,7 +55,10 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d); ''; - disabledTests = lib.optionals stdenv.isDarwin [ + + disabledTests = [ + "test_scripts" + ] ++ lib.optionals stdenv.isDarwin [ # likely related to https://github.com/sarugaku/shellingham/issues/35 "test_show_completion" "test_install_completion" @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building CLI applications"; homepage = "https://typer.tiangolo.com/"; + changelog = "https://github.com/tiangolo/typer/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ winpat ]; }; From 2eb6d1855614db8878e8dbfc433edf08dfeb4bf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jun 2023 23:38:43 +0200 Subject: [PATCH 2/6] python310Packages.spacy: 3.5.2 -> 3.5.3 Changelog: https://github.com/explosion/spaCy/releases/tag/v3.5.3 --- .../python-modules/spacy/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index f6ecf1d7ebe7..30e7cbfa1cc0 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , blis , buildPythonPackage , callPackage @@ -17,6 +18,7 @@ , pytest , python , pythonOlder +, pythonRelaxDepsHook , requests , setuptools , spacy-legacy @@ -28,7 +30,6 @@ , typing-extensions , wasabi , writeScript -, stdenv , nix , git , nix-update @@ -36,16 +37,24 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.5.2"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IsH/qrKFt0dwA9S1sDhBTMMkaKaQ1HkBW5ppjFMcgTs="; + hash = "sha256-NZcdZyFXZTjWxCPGagnOAL9m4Q5AcmpXt6gZkxgMJIw="; }; + pythonRelaxDeps = [ + "typer" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ blis catalogue @@ -70,9 +79,7 @@ buildPythonPackage rec { wasabi ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; - - postPatch = '' + ]; postPatch = '' substituteInPlace setup.cfg \ --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" ''; @@ -82,6 +89,7 @@ buildPythonPackage rec { ]; doCheck = false; + checkPhase = '' ${python.interpreter} -m pytest spacy/tests --vectors --models --slow ''; From 2c9c83b03e2d57fc9caffe9e5c5b9fa58b28470c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 00:04:39 +0200 Subject: [PATCH 3/6] python310Packages.coinmetrics-api-client: 2023.5.26.17 -> 2023.6.8.20 --- .../coinmetrics-api-client/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 31fc61aa0d98..976b1abbb871 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -5,10 +5,11 @@ , orjson , pandas , poetry-core -, pytestCheckHook , pytest-mock -, pythonOlder +, pytestCheckHook , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , requests , typer , websocket-client @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.5.26.17"; + version = "2023.6.8.20"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,11 +27,16 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-GCHXraeH6WWTlCnw9B1Xwtb6jwcxcvW1siy2T/8x14Q="; + hash = "sha256-Koll0pod0vSW/F3veGTn8JYOMQI61REUW6Eh+TDJKNI="; }; + pythonRelaxDeps = [ + "typer" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -52,7 +58,9 @@ buildPythonPackage rec { passthru = { optional-dependencies = { - pandas = [ pandas ]; + pandas = [ + pandas + ]; }; updateScript = nix-update-script { }; }; From c13299137efdd6381affadef18867af558c9b7fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 00:07:07 +0200 Subject: [PATCH 4/6] shell-genie: relax typer contraint --- pkgs/applications/misc/shell-genie/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 0f4851563202..9c64415132fa 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -16,8 +16,13 @@ buildPythonPackage rec { hash = "sha256-z7LiAq2jLzqjg4Q/r9o7M6VbedeT34NyPpgctfqBp+8="; }; + pythonRelaxDeps = [ + "typer" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ From 1267c76570009813c1879a4699aabc63d0d2c4c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 00:12:12 +0200 Subject: [PATCH 5/6] python311Packages.rstcheck: relax typer constraint --- pkgs/development/python-modules/rstcheck/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 0d06168191f1..2ad2e206b6c4 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -7,6 +7,7 @@ , pydantic , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , rstcheck-core , typer , types-docutils @@ -27,8 +28,13 @@ buildPythonPackage rec { hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU="; }; + pythonRelaxDeps = [ + "typer" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ From ba8ca6aa28359c5096bbcb4b42a952f74f38df24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 00:31:40 +0200 Subject: [PATCH 6/6] dbx: migrate to pythonRelaxDepsHook --- pkgs/applications/misc/dbx/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 3c6cb1e78f0f..e8b0d4cc7228 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -16,11 +16,18 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-dArR1z3wkGDd3Y1WHK0sLjhuaKHAcsx6cCH2rgVdUGs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \ - --replace "rich==12.6.0" "rich" - ''; + pythonRelaxDeps = [ + "rich" + "typer" + ]; + + pythonRemoveDeps = [ + "mlflow-skinny" + ]; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; propagatedBuildInputs = with python3.pkgs; [ aiohttp