From c5010efa1f3b5d8a27bce0eca2ec0244a8cec8f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:08:18 +0200 Subject: [PATCH 1/6] python312Packages.timecop: refactor - add pythonImportsCheck - switch to unittestCheckHook --- .../python-modules/timecop/default.nix | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/timecop/default.nix b/pkgs/development/python-modules/timecop/default.nix index fb455d079b0e..d3ab9014e072 100644 --- a/pkgs/development/python-modules/timecop/default.nix +++ b/pkgs/development/python-modules/timecop/default.nix @@ -1,20 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, unittestCheckHook +}: buildPythonPackage rec { pname = "timecop"; version = "0.5.0dev"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0zbi58sw2yp1qchzfhyi7bsrwxajiypphg65fir98kvj03g011wd"; + hash = "sha256-jYcA3gByT5RydMU8eK+PUnWe9TrRQ/chw+F6wTUqcX0="; }; + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + # test_epoch fails, see https://github.com/bluekelp/pytimecop/issues/4 preCheck = '' sed -i 's/test_epoch/_test_epoch/' timecop/tests/test_freeze.py ''; + pythonImportsCheck = [ + "timecop" + ]; + meta = with lib; { description = "A port of the most excellent TimeCop Ruby Gem for Python"; homepage = "https://github.com/bluekelp/pytimecop"; From 7a4f45d7cf88320c487540c032b42acf53bacdf8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:09:06 +0200 Subject: [PATCH 2/6] python312Packages.timecop: format with nixfmt --- .../python-modules/timecop/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/timecop/default.nix b/pkgs/development/python-modules/timecop/default.nix index d3ab9014e072..443b609fb4c4 100644 --- a/pkgs/development/python-modules/timecop/default.nix +++ b/pkgs/development/python-modules/timecop/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools -, unittestCheckHook +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + unittestCheckHook, }: buildPythonPackage rec { @@ -18,22 +19,16 @@ buildPythonPackage rec { hash = "sha256-jYcA3gByT5RydMU8eK+PUnWe9TrRQ/chw+F6wTUqcX0="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - unittestCheckHook - ]; + nativeCheckInputs = [ unittestCheckHook ]; # test_epoch fails, see https://github.com/bluekelp/pytimecop/issues/4 preCheck = '' sed -i 's/test_epoch/_test_epoch/' timecop/tests/test_freeze.py ''; - pythonImportsCheck = [ - "timecop" - ]; + pythonImportsCheck = [ "timecop" ]; meta = with lib; { description = "A port of the most excellent TimeCop Ruby Gem for Python"; From b0cfbcb15991b7e01d9739e23925e1c98433c49c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:10:34 +0200 Subject: [PATCH 3/6] python312Packages.onetimepass: refactor - switch to unittestCheckHook --- .../python-modules/onetimepass/default.nix | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix index 3bea443a36f2..48fc61f168b5 100644 --- a/pkgs/development/python-modules/onetimepass/default.nix +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -1,30 +1,48 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, timecop }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, six +, timecop +, unittestCheckHook +}: buildPythonPackage rec { pname = "onetimepass"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tadeck"; - repo = pname; - rev = "v${version}"; - sha256 = "0wmv62l3r8r4428gdzyj80lhgadfqvj220khz1wnm9alyzg60wkh"; + repo = "onetimepass"; + rev = "refs/tags/v${version}"; + hash = "sha256-cHJg3vdUpWp5+HACIeTGrqkHKUDS//aQICSjPKgwu3I="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ six ]; nativeCheckInputs = [ timecop + unittestCheckHook ]; - pythonImportsCheck = [ "onetimepass" ]; + pythonImportsCheck = [ + "onetimepass" + ]; meta = with lib; { description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; homepage = "https://github.com/tadeck/onetimepass"; + changelog = "https://github.com/tadeck/onetimepass/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ zakame ]; }; From 8748ff8ae8b26ba3d99aa14a2e4dc69507e9baf3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:11:31 +0200 Subject: [PATCH 4/6] python312Packages.onetimepass: format with nixfmt --- .../python-modules/onetimepass/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix index 48fc61f168b5..dde4983c2afe 100644 --- a/pkgs/development/python-modules/onetimepass/default.nix +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, six -, timecop -, unittestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + six, + timecop, + unittestCheckHook, }: buildPythonPackage rec { @@ -22,22 +23,16 @@ buildPythonPackage rec { hash = "sha256-cHJg3vdUpWp5+HACIeTGrqkHKUDS//aQICSjPKgwu3I="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - six - ]; + dependencies = [ six ]; nativeCheckInputs = [ timecop unittestCheckHook ]; - pythonImportsCheck = [ - "onetimepass" - ]; + pythonImportsCheck = [ "onetimepass" ]; meta = with lib; { description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; From 9e9aa732af490e43662e30e9872b569a10c3e2ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:37:12 +0200 Subject: [PATCH 5/6] awslimitchecker: refactor - override pytest --- pkgs/tools/admin/awslimitchecker/default.nix | 49 +++++++++++--------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix index 548bf69e6f07..e3d4c9fb6263 100644 --- a/pkgs/tools/admin/awslimitchecker/default.nix +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -1,17 +1,30 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, fetchFromGitHub +, python3 +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "awslimitchecker"; version = "12.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "jantman"; repo = "awslimitchecker"; - rev = version; - sha256 = "1p6n4kziyl6sfq7vgga9v88ddwh3sgnfb1m1cx6q25n0wyl7phgv"; + rev = "refs/tags/${version}"; + hash = "sha256-+8F7qOfAFoFNZ6GG5ezTA/LWENpJvbcPdtpQH/8k1tw="; }; - propagatedBuildInputs = with python3Packages; [ + patches = [ + # Fix the version lookup to use only the hardcoded version in the source package + ./version.patch + ]; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ boto3 botocore pytz @@ -19,27 +32,15 @@ python3Packages.buildPythonApplication rec { versionfinder ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python3.pkgs; [ freezegun onetimepass - pytestCheckHook pyotp + mock + (pytestCheckHook.override { pytest = pytest_7; }) testfixtures ]; - patches = [ - # Fix the version lookup to use only the hardcoded version in the source package - ./version.patch - ]; - - pytestFlagsArray = [ - "awslimitchecker/tests" - - # Upstream did not adapt to pytest 8 yet. - "-W" - "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTestPaths = [ # AWS tests that use the network "awslimitchecker/tests/services" @@ -50,14 +51,16 @@ python3Packages.buildPythonApplication rec { "awslimitchecker/tests/test_version.py" ]; - pythonImportsCheck = [ "awslimitchecker.checker" ]; + pythonImportsCheck = [ + "awslimitchecker.checker" + ]; meta = with lib; { + description = "A script and python package to check your AWS service limits and usage via boto3"; homepage = "http://awslimitchecker.readthedocs.org"; changelog = "https://github.com/jantman/awslimitchecker/blob/${version}/CHANGES.rst"; - description = "A script and python package to check your AWS service limits and usage via boto3"; - mainProgram = "awslimitchecker"; license = licenses.agpl3Plus; maintainers = with maintainers; [ zakame ]; + mainProgram = "awslimitchecker"; }; } From f747fb392392211fbecec1b28078e609002dcfc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 09:39:03 +0200 Subject: [PATCH 6/6] awslimitchecker: format with nixfmt --- pkgs/tools/admin/awslimitchecker/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix index e3d4c9fb6263..760a6f1e67d0 100644 --- a/pkgs/tools/admin/awslimitchecker/default.nix +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -20,9 +21,7 @@ python3.pkgs.buildPythonApplication rec { ./version.patch ]; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ boto3 @@ -51,9 +50,7 @@ python3.pkgs.buildPythonApplication rec { "awslimitchecker/tests/test_version.py" ]; - pythonImportsCheck = [ - "awslimitchecker.checker" - ]; + pythonImportsCheck = [ "awslimitchecker.checker" ]; meta = with lib; { description = "A script and python package to check your AWS service limits and usage via boto3";