From faaddd164167bf2ab2dd9a8ebe872657d5ac13ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:14:46 +0200 Subject: [PATCH 1/4] python312Packages.validate-email: refactor --- .../python-modules/validate-email/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 1c8e8d3c384a..8975ab1984cc 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,23 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "validate-email"; version = "1.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "validate_email"; - sha256 = "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq"; + hash = "sha256-eEcZ3F94C+MZzdGF3IXdk6/r2267lDgRvEx8X5xyrq8="; }; + build-system = [ + setuptools + ]; + # No tests doCheck = false; + pythonImportsCheck = [ + "validate_email" + ]; + meta = with lib; { - homepage = "https://github.com/syrusakbary/validate_email"; description = "Verify if an email address is valid and really exists"; + homepage = "https://github.com/syrusakbary/validate_email"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } From 13b336328d0643ec5160f486fddeb1f2c7c2ed9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:15:06 +0200 Subject: [PATCH 2/4] python312Packages.validate-email: format with nixfmt --- .../python-modules/validate-email/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 8975ab1984cc..441a0671461c 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -18,16 +19,12 @@ buildPythonPackage rec { hash = "sha256-eEcZ3F94C+MZzdGF3IXdk6/r2267lDgRvEx8X5xyrq8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # No tests doCheck = false; - pythonImportsCheck = [ - "validate_email" - ]; + pythonImportsCheck = [ "validate_email" ]; meta = with lib; { description = "Verify if an email address is valid and really exists"; From 57a4d93bc190aa5aefa0e933629a55a7725d90f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:22:17 +0200 Subject: [PATCH 3/4] python311Packages.toggl-cli: format with nixfmt --- .../python-modules/toggl-cli/default.nix | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 92481399143d..46af1d16e38b 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildPythonPackage -, click -, click-completion -, factory-boy -, faker -, fetchPypi -, inquirer -, notify-py -, pbr -, pendulum -, ptable -, pytest-mock -, pytestCheckHook -, pythonOlder -, requests -, twine -, validate-email +{ + lib, + buildPythonPackage, + click, + click-completion, + factory-boy, + faker, + fetchPypi, + inquirer, + notify-py, + pbr, + pendulum, + ptable, + pytest-mock, + pytestCheckHook, + pythonOlder, + requests, + twine, + validate-email, }: buildPythonPackage rec { @@ -79,9 +80,7 @@ buildPythonPackage rec { "test_now" ]; - pythonImportsCheck = [ - "toggl" - ]; + pythonImportsCheck = [ "toggl" ]; # updates to a bogus tag passthru.skipBulkUpdate = true; From a1ecc99f102f5dd1046c22db2f3c017f183d3211 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:28:23 +0200 Subject: [PATCH 4/4] python312Packages.toggl-cli: 2.4.3 -> 2.4.4 Changelog: https://github.com/AuHau/toggl-cli/releases/tag/v2.4.4 --- .../python-modules/toggl-cli/default.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 46af1d16e38b..8e221c312bae 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -10,41 +10,50 @@ notify-py, pbr, pendulum, - ptable, + prettytable, pytest-mock, pytestCheckHook, pythonOlder, requests, + setuptools, twine, validate-email, }: buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.3"; - format = "setuptools"; + version = "2.4.4"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "togglCli"; inherit version; - hash = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; + hash = "sha256-P4pv6LMPIWXD04IQw01yo3z3voeV4OmsBOCSJgcrZ6g="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace requirements.txt \ + --replace-fail "==" ">=" + substituteInPlace pytest.ini \ + --replace ' --cov toggl -m "not premium"' "" + ''; + + build-system = [ pbr + setuptools twine ]; - propagatedBuildInputs = [ + dependencies = [ click click-completion inquirer notify-py pbr pendulum - ptable + prettytable requests validate-email ]; @@ -56,16 +65,6 @@ buildPythonPackage rec { factory-boy ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "notify-py==0.3.3" "notify-py>=0.3.3" \ - --replace "click==8.0.3" "click>=8.0.3" \ - --replace "pbr==5.8.0" "pbr>=5.8.0" \ - --replace "inquirer==2.9.1" "inquirer>=2.9.1" - substituteInPlace pytest.ini \ - --replace ' --cov toggl -m "not premium"' "" - ''; - preCheck = '' export TOGGL_API_TOKEN=your_api_token export TOGGL_PASSWORD=toggl_password @@ -75,9 +74,10 @@ buildPythonPackage rec { disabledTests = [ "integration" "premium" + "test_basic_usage" + "test_now" "test_parsing" "test_type_check" - "test_now" ]; pythonImportsCheck = [ "toggl" ]; @@ -87,9 +87,9 @@ buildPythonPackage rec { meta = with lib; { description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; - mainProgram = "toggl"; homepage = "https://toggl.uhlir.dev/"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + mainProgram = "toggl"; }; }