Merge pull request #310898 from TomaSajt/pyfxa-deps

python312Packages.{hawkauthlib,pybrowserid}: fix tests, refactor; python312Packages.pyfxa: use pyproject = true

authored by Leona Maroni and committed by GitHub 2eb15b41 832e6a69

+60 -19
+27 -10
pkgs/development/python-modules/hawkauthlib/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , fetchFromGitHub 4 - , requests 5 - , webob 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchFromGitHub, 5 + setuptools, 6 + requests, 7 + webob, 8 + unittestCheckHook, 6 9 }: 7 10 8 11 buildPythonPackage rec { 9 12 pname = "hawkauthlib"; 10 13 version = "0.1.1"; 11 - format = "setuptools"; 14 + pyproject = true; 12 15 13 16 src = fetchFromGitHub { 14 17 owner = "mozilla-services"; 15 - repo = pname; 18 + repo = "hawkauthlib"; 16 19 rev = "refs/tags/v${version}"; 17 - sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; 20 + hash = "sha256-UW++gLQX1U4jFwccL+O5wl2r/d2OZ5Ug0wcnSfqtIVc="; 18 21 }; 19 22 20 - propagatedBuildInputs = [ requests webob ]; 23 + postPatch = '' 24 + substituteInPlace hawkauthlib/tests/* \ 25 + --replace-warn 'assertEquals' 'assertEqual' 26 + ''; 27 + 28 + build-system = [ setuptools ]; 29 + 30 + dependencies = [ 31 + requests 32 + webob 33 + ]; 34 + 35 + pythonImportsCheck = [ "hawkauthlib" ]; 36 + 37 + nativeCheckInputs = [ unittestCheckHook ]; 21 38 22 39 meta = with lib; { 23 40 homepage = "https://github.com/mozilla-services/hawkauthlib"; 24 41 description = "Hawk Access Authentication protocol"; 25 42 license = licenses.mpl20; 43 + maintainers = with maintainers; [ ]; 26 44 }; 27 - 28 45 }
+27 -7
pkgs/development/python-modules/pybrowserid/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi 2 - , requests, mock }: 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchPypi, 5 + setuptools, 6 + requests, 7 + unittestCheckHook, 8 + mock, 9 + }: 3 10 4 11 buildPythonPackage rec { 5 12 pname = "pybrowserid"; 6 13 version = "0.14.0"; 14 + pyproject = true; 7 15 8 16 src = fetchPypi { 9 17 pname = "PyBrowserID"; 10 18 inherit version; 11 - sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc"; 19 + hash = "sha256-bCJ2aeh8wleWrnb2oO9lAlUoyK2C01Jnn6mj5WY6ceM="; 12 20 }; 13 21 14 - propagatedBuildInputs = [ requests ]; 22 + postPatch = '' 23 + substituteInPlace browserid/tests/* \ 24 + --replace-warn 'assertEquals' 'assertEqual' 25 + ''; 15 26 16 - nativeCheckInputs = [ mock ]; 27 + build-system = [ setuptools ]; 28 + 29 + dependencies = [ requests ]; 30 + 31 + pythonImportsCheck = [ "browserid" ]; 32 + 33 + nativeCheckInputs = [ 34 + unittestCheckHook 35 + mock 36 + ]; 17 37 18 38 meta = with lib; { 19 39 description = "Python library for the BrowserID Protocol"; 20 - homepage = "https://github.com/mozilla/PyBrowserID"; 21 - license = licenses.mpl20; 40 + homepage = "https://github.com/mozilla/PyBrowserID"; 41 + license = licenses.mpl20; 22 42 maintainers = with maintainers; [ ]; 23 43 }; 24 44 }
+6 -2
pkgs/development/python-modules/pyfxa/default.nix
··· 18 18 buildPythonPackage rec { 19 19 pname = "pyfxa"; 20 20 version = "0.7.8"; 21 - format = "setuptools"; 21 + pyproject = true; 22 22 23 23 disabled = pythonOlder "3.7"; 24 24 ··· 28 28 hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4="; 29 29 }; 30 30 31 - propagatedBuildInputs = [ 31 + build-system = [ 32 + setuptools 33 + ]; 34 + 35 + dependencies = [ 32 36 cryptography 33 37 hawkauthlib 34 38 pybrowserid