Merge pull request #310898 from TomaSajt/pyfxa-deps
python312Packages.{hawkauthlib,pybrowserid}: fix tests, refactor; python312Packages.pyfxa: use pyproject = true
This commit is contained in:
commit
2eb15b411d
@ -1,28 +1,45 @@
|
|||||||
{ lib
|
{
|
||||||
, buildPythonPackage
|
lib,
|
||||||
, fetchFromGitHub
|
buildPythonPackage,
|
||||||
, requests
|
fetchFromGitHub,
|
||||||
, webob
|
setuptools,
|
||||||
|
requests,
|
||||||
|
webob,
|
||||||
|
unittestCheckHook,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "hawkauthlib";
|
pname = "hawkauthlib";
|
||||||
version = "0.1.1";
|
version = "0.1.1";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mozilla-services";
|
owner = "mozilla-services";
|
||||||
repo = pname;
|
repo = "hawkauthlib";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi";
|
hash = "sha256-UW++gLQX1U4jFwccL+O5wl2r/d2OZ5Ug0wcnSfqtIVc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests webob ];
|
postPatch = ''
|
||||||
|
substituteInPlace hawkauthlib/tests/* \
|
||||||
|
--replace-warn 'assertEquals' 'assertEqual'
|
||||||
|
'';
|
||||||
|
|
||||||
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
requests
|
||||||
|
webob
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "hawkauthlib" ];
|
||||||
|
|
||||||
|
nativeCheckInputs = [ unittestCheckHook ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/mozilla-services/hawkauthlib";
|
homepage = "https://github.com/mozilla-services/hawkauthlib";
|
||||||
description = "Hawk Access Authentication protocol";
|
description = "Hawk Access Authentication protocol";
|
||||||
license = licenses.mpl20;
|
license = licenses.mpl20;
|
||||||
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,24 +1,44 @@
|
|||||||
{ lib, buildPythonPackage, fetchPypi
|
{
|
||||||
, requests, mock }:
|
lib,
|
||||||
|
buildPythonPackage,
|
||||||
|
fetchPypi,
|
||||||
|
setuptools,
|
||||||
|
requests,
|
||||||
|
unittestCheckHook,
|
||||||
|
mock,
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pybrowserid";
|
pname = "pybrowserid";
|
||||||
version = "0.14.0";
|
version = "0.14.0";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "PyBrowserID";
|
pname = "PyBrowserID";
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc";
|
hash = "sha256-bCJ2aeh8wleWrnb2oO9lAlUoyK2C01Jnn6mj5WY6ceM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests ];
|
postPatch = ''
|
||||||
|
substituteInPlace browserid/tests/* \
|
||||||
|
--replace-warn 'assertEquals' 'assertEqual'
|
||||||
|
'';
|
||||||
|
|
||||||
nativeCheckInputs = [ mock ];
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
|
dependencies = [ requests ];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "browserid" ];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
unittestCheckHook
|
||||||
|
mock
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python library for the BrowserID Protocol";
|
description = "Python library for the BrowserID Protocol";
|
||||||
homepage = "https://github.com/mozilla/PyBrowserID";
|
homepage = "https://github.com/mozilla/PyBrowserID";
|
||||||
license = licenses.mpl20;
|
license = licenses.mpl20;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyfxa";
|
pname = "pyfxa";
|
||||||
version = "0.7.8";
|
version = "0.7.8";
|
||||||
format = "setuptools";
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
@ -28,7 +28,11 @@ buildPythonPackage rec {
|
|||||||
hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4=";
|
hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
build-system = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
cryptography
|
cryptography
|
||||||
hawkauthlib
|
hawkauthlib
|
||||||
pybrowserid
|
pybrowserid
|
||||||
|
Loading…
Reference in New Issue
Block a user