Unverified Commit 2eb15b41 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #310898 from TomaSajt/pyfxa-deps

python312Packages.{hawkauthlib,pybrowserid}: fix tests, refactor; python312Packages.pyfxa: use pyproject = true
parents 832e6a69 b894609c
Loading
Loading
Loading
Loading
+27 −10
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, webob
{
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  setuptools,
  requests,
  webob,
  unittestCheckHook,
}:

buildPythonPackage rec {
  pname = "hawkauthlib";
  version = "0.1.1";
  format = "setuptools";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mozilla-services";
    repo = pname;
    repo = "hawkauthlib";
    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; {
    homepage = "https://github.com/mozilla-services/hawkauthlib";
    description = "Hawk Access Authentication protocol";
    license = licenses.mpl20;
    maintainers = with maintainers; [ ];
  };

}
+27 −7
Original line number Diff line number Diff line
{ lib, buildPythonPackage, fetchPypi
, requests, mock }:
{
  lib,
  buildPythonPackage,
  fetchPypi,
  setuptools,
  requests,
  unittestCheckHook,
  mock,
}:

buildPythonPackage rec {
  pname = "pybrowserid";
  version = "0.14.0";
  pyproject = true;

  src = fetchPypi {
    pname = "PyBrowserID";
    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; {
    description = "Python library for the BrowserID Protocol";
+6 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
buildPythonPackage rec {
  pname = "pyfxa";
  version = "0.7.8";
  format = "setuptools";
  pyproject = true;

  disabled = pythonOlder "3.7";

@@ -28,7 +28,11 @@ buildPythonPackage rec {
    hash = "sha256-DMFZl1hbYNaScOTWkAbK2nKti6wD5SS5A30q7TW5vO4=";
  };

  propagatedBuildInputs = [
  build-system = [
    setuptools
  ];

  dependencies = [
    cryptography
    hawkauthlib
    pybrowserid