Loading pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patchdeleted 100644 → 0 +0 −31 Original line number Diff line number Diff line From d20c7039316ea7c76da86963b266d3c34001b9f7 Mon Sep 17 00:00:00 2001 From: Marcel <me@m4rc3l.de> Date: Sat, 2 Nov 2024 21:13:37 +0100 Subject: [PATCH] setup: remove nose, coverage --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b880f27..7a47360 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6' ], - setup_requires=["nose", "coverage", "mock"], + setup_requires=["mock"], install_requires=["py-radix==0.10.0"] + ( ["future", "ipaddress"] if sys.version_info.major == 2 else [] ), @@ -78,5 +78,4 @@ setup( entry_points={'console_scripts': ['aggregate6 = aggregate6.aggregate6:main']}, data_files = [('man/man7', ['aggregate6.7'])], - test_suite='nose.collector' ) -- 2.44.1 pkgs/development/python-modules/aggregate6/default.nix +7 −6 Original line number Diff line number Diff line Loading @@ -4,25 +4,25 @@ fetchFromGitHub, setuptools, py-radix-sr, versionCheckHook, pytestCheckHook, mock, }: buildPythonPackage rec { pname = "aggregate6"; version = "1.0.12"; version = "1.0.14"; pyproject = true; src = fetchFromGitHub { owner = "job"; repo = "aggregate6"; rev = version; hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0="; hash = "sha256-sF5F4AIIQuMTuWE3zoBE1akJX9QSmAaRp1qgoHzSJMo="; }; patches = [ ./0001-setup-remove-nose-coverage.patch ]; # py-radix-sr is a fork, with fixes # NOTE: it should be worth switching to py-radix again in the future as there # is still development sadly currently without a new release. postPatch = '' substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr' ''; Loading @@ -33,10 +33,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook mock versionCheckHook ]; pythonImportsCheck = [ "aggregate6" ]; versionCheckProgramArg = "-V"; meta = { description = "IPv4 and IPv6 prefix aggregation tool"; Loading Loading
pkgs/development/python-modules/aggregate6/0001-setup-remove-nose-coverage.patchdeleted 100644 → 0 +0 −31 Original line number Diff line number Diff line From d20c7039316ea7c76da86963b266d3c34001b9f7 Mon Sep 17 00:00:00 2001 From: Marcel <me@m4rc3l.de> Date: Sat, 2 Nov 2024 21:13:37 +0100 Subject: [PATCH] setup: remove nose, coverage --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b880f27..7a47360 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6' ], - setup_requires=["nose", "coverage", "mock"], + setup_requires=["mock"], install_requires=["py-radix==0.10.0"] + ( ["future", "ipaddress"] if sys.version_info.major == 2 else [] ), @@ -78,5 +78,4 @@ setup( entry_points={'console_scripts': ['aggregate6 = aggregate6.aggregate6:main']}, data_files = [('man/man7', ['aggregate6.7'])], - test_suite='nose.collector' ) -- 2.44.1
pkgs/development/python-modules/aggregate6/default.nix +7 −6 Original line number Diff line number Diff line Loading @@ -4,25 +4,25 @@ fetchFromGitHub, setuptools, py-radix-sr, versionCheckHook, pytestCheckHook, mock, }: buildPythonPackage rec { pname = "aggregate6"; version = "1.0.12"; version = "1.0.14"; pyproject = true; src = fetchFromGitHub { owner = "job"; repo = "aggregate6"; rev = version; hash = "sha256-tBo9LSmEu/0KPSeg17dlh7ngUvP9GyW6b01qqpr5Bx0="; hash = "sha256-sF5F4AIIQuMTuWE3zoBE1akJX9QSmAaRp1qgoHzSJMo="; }; patches = [ ./0001-setup-remove-nose-coverage.patch ]; # py-radix-sr is a fork, with fixes # NOTE: it should be worth switching to py-radix again in the future as there # is still development sadly currently without a new release. postPatch = '' substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr' ''; Loading @@ -33,10 +33,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook mock versionCheckHook ]; pythonImportsCheck = [ "aggregate6" ]; versionCheckProgramArg = "-V"; meta = { description = "IPv4 and IPv6 prefix aggregation tool"; Loading