Unverified Commit 4f919bb6 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #312418 from fabaff/hass-nabucasa-bump 

python312Packages.snitun: 0.36.2 -> 0.39.1, python312Packages.pycognito: 2024.2.0 -> 2024.5.1python312Packages.hass-nabucasa: 0.80.0 -> 0.81.0
parents 16732aad f0884ae4

pkgs/development/python-modules/hass-nabucasa/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


buildPythonPackage rec {

  pname = "hass-nabucasa";

  version = "0.80.0";

  version = "0.81.0";

  pyproject = true;



  disabled = pythonOlder "3.11";
@@ -32,7 +32,7 @@ buildPythonPackage rec { 
    owner = "nabucasa";

    repo = "hass-nabucasa";

    rev = "refs/tags/${version}";

    hash = "sha256-8KxnS6LTK077/hr81JOiOj8GaNWBXO8XlvpYBm/sZbI=";

    hash = "sha256-61pdl9bjtvC9Fa7jCtSPEz/5PJiANmKqOSSHjK7is2s=";

  };



  pythonRelaxDeps = [ "acme" ];

pkgs/development/python-modules/pycognito/default.nix

+28 −29
Original line number Diff line number Diff line 
{ lib

, boto3

, buildPythonPackage

, envs

, fetchFromGitHub

, isPy27

, freezegun

, mock

, moto

, pyjwt

, pytestCheckHook

, requests

, requests-mock

{

  lib,

  boto3,

  buildPythonPackage,

  envs,

  fetchFromGitHub,

  freezegun,

  mock,

  moto,

  pyjwt,

  pytestCheckHook,

  pythonOlder,

  requests,

  requests-mock,

  setuptools,

}:



buildPythonPackage rec {

  pname = "pycognito";

  version = "2024.2.0";

  format = "setuptools";

  disabled = isPy27;

  version = "2024.5.1";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "pvizeli";

    repo = pname;

    repo = "pycognito";

    rev = "refs/tags/${version}";

    hash = "sha256-VYko5KcJvnhPUceTll2BBJWb88SYnSL7S3mZ7XSLPSQ=";

    hash = "sha256-U23fFLru4j6GnWMcYtsCW9BVJkVcCoefPH6oMijYGew=";

  };



  propagatedBuildInputs = [

  build-system = [ setuptools ];



  dependencies = [

    boto3

    envs

    pyjwt

    requests

  ]

  ++ pyjwt.optional-dependencies.crypto;

  ] ++ pyjwt.optional-dependencies.crypto;



  nativeCheckInputs = [

    freezegun
@@ -40,18 +44,12 @@ buildPythonPackage rec { 
    moto

    pytestCheckHook

    requests-mock

  ]

  ++ moto.optional-dependencies.cognitoidp;



  postPatch = ''

    substituteInPlace setup.py \

      --replace 'python-jose[cryptography]' 'python-jose'

  '';

  ] ++ moto.optional-dependencies.cognitoidp;



  pytestFlagsArray = [ "tests.py" ];



  disabledTests = [

    # requires network access

    # Test requires network access

    "test_srp_requests_http_auth"

  ];
@@ -60,6 +58,7 @@ buildPythonPackage rec { 
  meta = with lib; {

    description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support";

    homepage = "https://github.com/pvizeli/pycognito";

    changelog = "https://github.com/NabuCasa/pycognito/releases/tag/${version}";

    license = licenses.asl20;

    maintainers = with maintainers; [ mic92 ];

  };

pkgs/development/python-modules/snitun/default.nix

+52 −48
Original line number Diff line number Diff line 
{ lib

, stdenv

, setuptools

, async-timeout

, attrs

, buildPythonPackage

, cryptography

, fetchFromGitHub

, pytest-aiohttp

, pytestCheckHook

, pythonAtLeast

, pythonOlder

{

  lib,

  stdenv,

  aiohttp,

  async-timeout,

  attrs,

  buildPythonPackage,

  cryptography,

  fetchFromGitHub,

  pytest-aiohttp,

  pytestCheckHook,

  pythonAtLeast,

  pythonOlder,

  setuptools,

}:



buildPythonPackage rec {

  pname = "snitun";

  version = "0.36.2";

  version = "0.39.1";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.10";



  src = fetchFromGitHub {

    owner = "NabuCasa";

    repo = "snitun";

    rev = "refs/tags/${version}";

    hash = "sha256-ViNsmTq1iLxNujA71b9JZB5AZ79ZbiqdTyDeBGd4gUA=";

    hash = "sha256-jewDQqvLUh/066BSEADXkCvjLFRnodKtUPKfvi0KUpI=";

  };



  nativeBuildInputs = [

    setuptools

  ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

  dependencies = [

    aiohttp

    async-timeout

    attrs

    cryptography
@@ -41,17 +42,20 @@ buildPythonPackage rec { 
    pytestCheckHook

  ];



  disabledTests = [

  disabledTests =

    [

      # AssertionError: Expected 'fileno' to not have been called. Called 1 times.

      "test_client_stop_no_wait"

  ] ++ lib.optionals stdenv.isDarwin [

    ]

    ++ lib.optionals stdenv.isDarwin [

      "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61

      # port binding conflicts

      "test_snitun_single_runner_timeout"

      "test_snitun_single_runner_throttling"

      # ConnectionResetError: [Errno 54] Connection reset by peer

      "test_peer_listener_timeout"

  ] ++ lib.optionals (pythonAtLeast "3.12") [

    ]

    ++ lib.optionals (pythonAtLeast "3.12") [

      # blocking

      "test_flow_client_peer"

      "test_close_client_peer"
@@ -73,9 +77,9 @@ buildPythonPackage rec { 
  pythonImportsCheck = [ "snitun" ];



  meta = with lib; {

    description = "SNI proxy with TCP multiplexer";

    changelog = "https://github.com/NabuCasa/snitun/releases/tag/${version}";

    homepage = "https://github.com/nabucasa/snitun";

    description = "SNI proxy with TCP multiplexer";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ Scriptkiddi ];

    platforms = platforms.linux;