Merge pull request #304499 from fabaff/validate-email-refactor

python312Packages.validate-email: refactor, python312Packages.toggl-cli: 2.4.3 -> 2.4.4

authored by Fabian Affolter and committed by GitHub a0d9c0f6 40e86901

+56 -45
+39 -40
pkgs/development/python-modules/toggl-cli/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , click 4 - , click-completion 5 - , factory-boy 6 - , faker 7 - , fetchPypi 8 - , inquirer 9 - , notify-py 10 - , pbr 11 - , pendulum 12 - , ptable 13 - , pytest-mock 14 - , pytestCheckHook 15 - , pythonOlder 16 - , requests 17 - , twine 18 - , validate-email 1 + { 2 + lib, 3 + buildPythonPackage, 4 + click, 5 + click-completion, 6 + factory-boy, 7 + faker, 8 + fetchPypi, 9 + inquirer, 10 + notify-py, 11 + pbr, 12 + pendulum, 13 + prettytable, 14 + pytest-mock, 15 + pytestCheckHook, 16 + pythonOlder, 17 + requests, 18 + setuptools, 19 + twine, 20 + validate-email, 19 21 }: 20 22 21 23 buildPythonPackage rec { 22 24 pname = "toggl-cli"; 23 - version = "2.4.3"; 24 - format = "setuptools"; 25 + version = "2.4.4"; 26 + pyproject = true; 25 27 26 - disabled = pythonOlder "3.6"; 28 + disabled = pythonOlder "3.7"; 27 29 28 30 src = fetchPypi { 29 31 pname = "togglCli"; 30 32 inherit version; 31 - hash = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; 33 + hash = "sha256-P4pv6LMPIWXD04IQw01yo3z3voeV4OmsBOCSJgcrZ6g="; 32 34 }; 33 35 34 - nativeBuildInputs = [ 36 + postPatch = '' 37 + substituteInPlace requirements.txt \ 38 + --replace-fail "==" ">=" 39 + substituteInPlace pytest.ini \ 40 + --replace ' --cov toggl -m "not premium"' "" 41 + ''; 42 + 43 + build-system = [ 35 44 pbr 45 + setuptools 36 46 twine 37 47 ]; 38 48 39 - propagatedBuildInputs = [ 49 + dependencies = [ 40 50 click 41 51 click-completion 42 52 inquirer 43 53 notify-py 44 54 pbr 45 55 pendulum 46 - ptable 56 + prettytable 47 57 requests 48 58 validate-email 49 59 ]; ··· 55 65 factory-boy 56 66 ]; 57 67 58 - postPatch = '' 59 - substituteInPlace requirements.txt \ 60 - --replace "notify-py==0.3.3" "notify-py>=0.3.3" \ 61 - --replace "click==8.0.3" "click>=8.0.3" \ 62 - --replace "pbr==5.8.0" "pbr>=5.8.0" \ 63 - --replace "inquirer==2.9.1" "inquirer>=2.9.1" 64 - substituteInPlace pytest.ini \ 65 - --replace ' --cov toggl -m "not premium"' "" 66 - ''; 67 - 68 68 preCheck = '' 69 69 export TOGGL_API_TOKEN=your_api_token 70 70 export TOGGL_PASSWORD=toggl_password ··· 74 74 disabledTests = [ 75 75 "integration" 76 76 "premium" 77 + "test_basic_usage" 78 + "test_now" 77 79 "test_parsing" 78 80 "test_type_check" 79 - "test_now" 80 81 ]; 81 82 82 - pythonImportsCheck = [ 83 - "toggl" 84 - ]; 83 + pythonImportsCheck = [ "toggl" ]; 85 84 86 85 # updates to a bogus tag 87 86 passthru.skipBulkUpdate = true; 88 87 89 88 meta = with lib; { 90 89 description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; 91 - mainProgram = "toggl"; 92 90 homepage = "https://toggl.uhlir.dev/"; 93 91 license = licenses.mit; 94 92 maintainers = with maintainers; [ mmahut ]; 93 + mainProgram = "toggl"; 95 94 }; 96 95 }
+17 -5
pkgs/development/python-modules/validate-email/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi }: 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchPypi, 5 + pythonOlder, 6 + setuptools, 7 + }: 2 8 3 9 buildPythonPackage rec { 4 10 pname = "validate-email"; 5 11 version = "1.3"; 6 - format = "setuptools"; 12 + pyproject = true; 13 + 14 + disabled = pythonOlder "3.7"; 7 15 8 16 src = fetchPypi { 9 17 inherit version; 10 18 pname = "validate_email"; 11 - sha256 = "1bxffaf5yz2cph8ki55vdvdypbwkvn2xr1firlcy62vqbzf1jivq"; 19 + hash = "sha256-eEcZ3F94C+MZzdGF3IXdk6/r2267lDgRvEx8X5xyrq8="; 12 20 }; 13 21 22 + build-system = [ setuptools ]; 23 + 14 24 # No tests 15 25 doCheck = false; 16 26 27 + pythonImportsCheck = [ "validate_email" ]; 28 + 17 29 meta = with lib; { 30 + description = "Verify if an email address is valid and really exists"; 18 31 homepage = "https://github.com/syrusakbary/validate_email"; 19 - description = "Verify if an email address is valid and really exists"; 20 32 license = licenses.lgpl3Plus; 21 - maintainers = [ maintainers.mmahut ]; 33 + maintainers = with maintainers; [ mmahut ]; 22 34 }; 23 35 }