From dad24c0a0d1dca5d56ea10c5f02dd80811e7e359 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 00:07:08 +0900 Subject: [PATCH 1/5] python311Packages.line-profiler: rename from line_profiler --- .../python-modules/{line_profiler => line-profiler}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/{line_profiler => line-profiler}/default.nix (100%) diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix similarity index 100% rename from pkgs/development/python-modules/line_profiler/default.nix rename to pkgs/development/python-modules/line-profiler/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..9d7c3d8f4d5b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -218,6 +218,7 @@ mapAliases ({ lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 + line_profiler = line-profiler; # added 2023-11-04 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d1..64b2d5c2ead0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6318,7 +6318,7 @@ self: super: with self; { lineedit = callPackage ../development/python-modules/lineedit { }; - line_profiler = callPackage ../development/python-modules/line_profiler { }; + line-profiler = callPackage ../development/python-modules/line-profiler { }; linetable = callPackage ../development/python-modules/linetable { }; From bcfad0b5b2a62854d5ed8a8ac80059ded5a7020b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 00:51:15 +0900 Subject: [PATCH 2/5] python311Packages.xdoctest: init at 1.1.2 --- .../python-modules/xdoctest/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/xdoctest/default.nix diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix new file mode 100644 index 000000000000..357e605d8534 --- /dev/null +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xdoctest"; + version = "1.1.2"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Erotemic"; + repo = "xdoctest"; + rev = "refs/tags/v${version}"; + hash = "sha256-yTu5ldr9TkpYRP8hjgUPpexBVLjaK2gfPvISjMJLY74="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + export PATH=$out/bin:$PATH + ''; + + pythonImportsCheck = [ "xdoctest" ]; + + meta = with lib; { + description = "A rewrite of Python's builtin doctest module (with pytest plugin integration) with AST instead of REGEX"; + homepage = "https://github.com/Erotemic/xdoctest"; + changelog = "https://github.com/Erotemic/xdoctest/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + mainProgram = "xdoctest"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64b2d5c2ead0..648c30e1840a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15765,6 +15765,8 @@ self: super: with self; { xdis = callPackage ../development/python-modules/xdis { }; + xdoctest = callPackage ../development/python-modules/xdoctest { }; + xdot = callPackage ../development/python-modules/xdot { inherit (pkgs) graphviz; }; From 1115e9fcf30be1a843e863b7446020ca31fac15b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 00:53:34 +0900 Subject: [PATCH 3/5] python311Packages.ubelt: init at 1.3.4 --- .../python-modules/ubelt/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/ubelt/default.nix diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix new file mode 100644 index 000000000000..a85be00ddf79 --- /dev/null +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, numpy +, python-dateutil +, xxhash +, pytestCheckHook +, requests +, xdoctest +}: + +buildPythonPackage rec { + pname = "ubelt"; + version = "1.3.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Erotemic"; + repo = "ubelt"; + rev = "refs/tags/v${version}"; + hash = "sha256-pvCmmdPRLupMUCiOvfa+JTX8NPFZ/UcXSPEaaDG3eTk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + passthru.optional-dependencies = { + optional = [ + numpy + python-dateutil + xxhash + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + requests + xdoctest + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + disabledTests = lib.optionals stdenv.isDarwin [ + # fail due to sandbox environment + "CacheStamp.expired" + "userhome" + ]; + + pythonImportsCheck = [ "ubelt" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A Python utility library with a stdlib like feel and extra batteries. Paths, Progress, Dicts, Downloads, Caching, Hashing: ubelt makes it easy"; + homepage = "https://github.com/Erotemic/ubelt"; + changelog = "https://github.com/Erotemic/ubelt/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 648c30e1840a..ce6c4e500a42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15135,6 +15135,8 @@ self: super: with self; { uasiren = callPackage ../development/python-modules/uasiren { }; + ubelt = callPackage ../development/python-modules/ubelt { }; + uc-micro-py = callPackage ../development/python-modules/uc-micro-py { }; ucsmsdk = callPackage ../development/python-modules/ucsmsdk { }; From 8fd4ec82f9561722eb1874d0368fc03e444fa96e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 00:58:17 +0900 Subject: [PATCH 4/5] python311Packages.line-profiler: use pytestCheckHook --- .../python-modules/line-profiler/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index d929b5e214bf..e962d8e341f8 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -4,11 +4,11 @@ , cython , isPyPy , ipython -, python , scikit-build , cmake , pythonOlder , pytestCheckHook +, ubelt }: buildPythonPackage rec { @@ -30,13 +30,14 @@ buildPythonPackage rec { scikit-build ]; - propagatedBuildInputs = [ - ipython - ]; + passthru.optional-dependencies = { + ipython = [ ipython ]; + }; nativeCheckInputs = [ pytestCheckHook - ]; + ubelt + ] ++ passthru.optional-dependencies.ipython; dontUseCmakeConfigure = true; @@ -44,8 +45,9 @@ buildPythonPackage rec { rm -f _line_profiler.c ''; - checkPhase = '' - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s . + preCheck = '' + rm -r line_profiler + export PATH=$out/bin:$PATH ''; pythonImportsCheck = [ From 2f188cd268601e925995ca24644c86ef88d981a3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 00:59:30 +0900 Subject: [PATCH 5/5] python311Packages.line-profiler: 4.0.2 -> 4.1.2 Changelog: https://github.com/pyutils/line_profiler/blob/v4.1.2/CHANGELOG.rst --- pkgs/development/python-modules/line-profiler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index e962d8e341f8..10decb4f3f52 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, cython +, cython_3 , isPyPy , ipython , scikit-build @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "4.0.2"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -21,11 +21,11 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw="; + hash = "sha256-qlZXiw/1p1b+GAs/2nvWfCe71Hiz0BJGEtjPAOSiHfI="; }; nativeBuildInputs = [ - cython + cython_3 cmake scikit-build ];