From 8fcd5ca1ed06acba3d59783617d8afdb6d855d95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 10:52:19 +0200 Subject: [PATCH 1/9] python310Packages.pyahocorasick: 1.4.4 -> 2.0.0b1 --- pkgs/development/python-modules/pyahocorasick/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 336e637edef..fd2c6de2c25 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "1.4.4"; + version = "2.0.0b1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,17 +17,13 @@ buildPythonPackage rec { owner = "WojciechMula"; repo = pname; rev = version; - hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo="; + hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; }; checkInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ - "unittests.py" - ]; - pythonImportsCheck = [ "ahocorasick" ]; From d96494b8dbe758406a1b8500f7246876886ba222 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 11:14:11 +0200 Subject: [PATCH 2/9] python310Packages.parameter-expansion-patched: 0.2.1b4 -> 0.3.1 --- .../parameter-expansion-patched/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/parameter-expansion-patched/default.nix b/pkgs/development/python-modules/parameter-expansion-patched/default.nix index 18511e1c70f..4f2c5eaf609 100644 --- a/pkgs/development/python-modules/parameter-expansion-patched/default.nix +++ b/pkgs/development/python-modules/parameter-expansion-patched/default.nix @@ -3,19 +3,27 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "parameter-expansion-patched"; - version = "0.2.1b4"; + version = "0.3.1"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs"; + hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + checkInputs = [ pytestCheckHook ]; @@ -26,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "POSIX parameter expansion in Python"; - homepage = "https://github.com/nexB/commoncode"; + homepage = "https://github.com/nexB/parameter_expansion_patched"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From de0b4f45dd11862f12843646b06f19bcbc7c149b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 11:22:17 +0200 Subject: [PATCH 3/9] python310Packages.plugincode: 21.1.21 -> 30.0.0 --- .../python-modules/plugincode/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix index 7270685f41b..2e54d5604e1 100644 --- a/pkgs/development/python-modules/plugincode/default.nix +++ b/pkgs/development/python-modules/plugincode/default.nix @@ -7,14 +7,19 @@ , pluggy , pytestCheckHook , pytest-xdist +, pythonOlder }: + buildPythonPackage rec { pname = "plugincode"; - version = "21.1.21"; + version = "30.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a"; + hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos="; }; dontConfigure = true; @@ -38,8 +43,13 @@ buildPythonPackage rec { "plugincode" ]; + disabledTests = [ + # We don't want black as an input + "test_skeleton_codestyle" + ]; + meta = with lib; { - description = "A library that provides plugin functionality for ScanCode toolkit"; + description = "Library that provides plugin functionality for ScanCode toolkit"; homepage = "https://github.com/nexB/plugincode"; license = licenses.asl20; maintainers = teams.determinatesystems.members; From 2ee2a8049099779d4e7004bae4a4fd501965d8cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 May 2022 11:24:34 +0200 Subject: [PATCH 4/9] python310Packages.typecode: 21.6.1 -> 30.0.0 --- pkgs/development/python-modules/typecode/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 16ee927e849..7b3a01a53a8 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -10,16 +10,19 @@ , typecode-libmagic , pytestCheckHook , pytest-xdist +, pythonOlder }: buildPythonPackage rec { pname = "typecode"; - version = "21.6.1"; + version = "30.0.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6"; + hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8="; }; dontConfigure = true; From bb4226fd75041aa113b6ae0d47b11c1be161586c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 May 2022 15:11:05 +0200 Subject: [PATCH 5/9] python310Packages.scancode-toolkit: 30.1.0 -> 31.0.0b4 --- .../scancode-toolkit/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 2c12019e9ac..40c52962e51 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -8,8 +8,9 @@ , click , colorama , commoncode +, container-inspector , debian-inspector -, dparse +, dparse2 , extractcode , extractcode-7z , extractcode-libarchive @@ -32,7 +33,8 @@ , packaging , parameter-expansion-patched , pefile -, pkginfo +, pip-requirements-parser +, pkginfo2 , pluggy , plugincode , publicsuffix2 @@ -58,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "30.1.0"; + version = "31.0.0b4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; + hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A="; }; dontConfigure = true; @@ -78,8 +80,9 @@ buildPythonPackage rec { click colorama commoncode + container-inspector debian-inspector - dparse + dparse2 extractcode extractcode-7z extractcode-libarchive @@ -88,6 +91,7 @@ buildPythonPackage rec { ftfy gemfileparser html5lib + importlib-metadata intbitset jaraco_functools javaproperties @@ -100,7 +104,8 @@ buildPythonPackage rec { packaging parameter-expansion-patched pefile - pkginfo + pip-requirements-parser + pkginfo2 pluggy plugincode publicsuffix2 @@ -118,9 +123,8 @@ buildPythonPackage rec { typecode-libmagic urlpy xmltodict - zipp ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-metadata + zipp ] ++ lib.optionals (pythonOlder "3.7") [ typing ]; From f04ff41118d305d0b62121a3ed1378da0955a9a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 May 2022 15:12:06 +0200 Subject: [PATCH 6/9] python310Packages.container-inspector: pretend version --- pkgs/development/python-modules/container-inspector/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index d8acd1160a8..9d4f67ca830 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + dontConfigure = true; nativeBuildInputs = [ From 1c7c689c0fb4ecb6695909fbf065d93e0bf53034 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 May 2022 15:13:13 +0200 Subject: [PATCH 7/9] python310Packages.debian-inspector: pretend version --- .../python-modules/debian-inspector/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 0da7f634d84..1c8cee1d718 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -6,24 +6,30 @@ , commoncode , pytestCheckHook , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "debian-inspector"; version = "30.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "debian_inspector"; inherit version; - sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; + hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + dontConfigure = true; + nativeBuildInputs = [ setuptools-scm ]; - dontConfigure = true; - propagatedBuildInputs = [ chardet attrs From 28d7018af96e87ef2d27ae47e7fe0a5a8d2f27ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 May 2022 15:13:42 +0200 Subject: [PATCH 8/9] python310Packages.license-expression: pretend version --- pkgs/development/python-modules/license-expression/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index c6f2c678ba9..e1f77e45dcc 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + dontConfigure = true; nativeBuildInputs = [ From 24df3cd4b61e492ac96f8456902616770764eced Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 May 2022 15:14:42 +0200 Subject: [PATCH 9/9] python310Packages.pip-requirements-parser: pretend version --- .../python-modules/pip-requirements-parser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix index d4246d302a2..0693fbf4fde 100644 --- a/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + dontConfigure = true; nativeBuildInputs = [