Unverified Commit 15e23a00 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #291110 from fabaff/boto3-bump 

python311Packages.botocore: 1.33.6 -> 1.34.49, python311Packages.s3transfer: 0.8.2 -> 0.10.0, python311Packages.boto3: 1.33.6 -> 1.34.49
parents 856e7322 5e7bc34a

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

+3 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


buildPythonPackage rec {

  pname = "aioboto3";

  version = "12.1.0";

  version = "12.3.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec { 
    owner = "terrycain";

    repo = "aioboto3";

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

    hash = "sha256-CVRDQhymQRi5dyVBLJYTnF3RI4jPBB966dVMT4lOd8g=";

    hash = "sha256-GDuxy/V+j0LRJ2lbcRHMEAga+pdCbYIWhEt3ItrHMB4=";

  };



  nativeBuildInputs = [
@@ -37,8 +37,7 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    aiobotocore

    boto3

  ];

  ] ++ aiobotocore.optional-dependencies.boto3;



  passthru.optional-dependencies = {

    chalice = [

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

+20 −4
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ 
, fetchFromGitHub

, flask

, flask-cors

, awscli

, moto

, boto3

, setuptools

, pytest-asyncio

, pytestCheckHook

, pythonOlder
@@ -16,16 +19,16 @@ 


buildPythonPackage rec {

  pname = "aiobotocore";

  version = "2.9.1";

  format = "setuptools";

  version = "2.11.2";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "aio-libs";

    repo = pname;

    repo = "aiobotocore";

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

    hash = "sha256-cODdmP/O24fNIugzl4AYdf3g4Gzwx3JseYKbZKgEPbc=";

    hash = "sha256-H9nsLPxjv3H5y6+5piBt6Pb+Wks4vwOitM+WQtyViPs=";

  };



  # Relax version constraints: aiobotocore works with newer botocore versions
@@ -34,6 +37,10 @@ buildPythonPackage rec { 
    sed -i "s/'botocore>=.*'/'botocore'/" setup.py

  '';



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    aiohttp

    aioitertools
@@ -41,6 +48,15 @@ buildPythonPackage rec { 
    wrapt

  ];



  passthru.optional-dependencies = {

    awscli = [

      awscli

    ];

    boto3 = [

      boto3

    ];

  };



  nativeCheckInputs = [

    dill

    flask

pkgs/development/python-modules/aws-encryption-sdk/default.nix

+20 −12
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, attrs

, boto3

, buildPythonPackage

, cryptography

, setuptools

, wrapt

, fetchPypi

, mock

, pytest

, pytest-mock

, pytestCheckHook

, pythonAtLeast

, pythonOlder

, setuptools

, wrapt

}:



buildPythonPackage rec {

  pname = "aws-encryption-sdk";

  version = "3.1.1";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM=";

  };



  nativeBuildInputs = [

    setuptools

  ];



  propagatedBuildInputs = [

    attrs

    boto3

    cryptography

    setuptools

    wrapt

  ];



  doCheck = true;



  nativeCheckInputs = [

    mock

    pytest

    pytest-mock

    pytestCheckHook

  ];



  disabledTestPaths = [

    # requires networking

    # Tests require networking

    "examples"

    "test/integration"

  ];



  disabledTests = lib.optionals (pythonAtLeast "3.12") [

    # AssertionError: Regex pattern did not match, https://github.com/aws/aws-encryption-sdk-python/issues/644

    "test_abstracts"

  ];



  meta = with lib; {

    description = "Python implementation of the AWS Encryption SDK";

    homepage = "https://aws-encryption-sdk-python.readthedocs.io/";

    changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst";

    description = "Fully compliant, native Python implementation of the AWS Encryption SDK.";

    license = licenses.asl20;

    maintainers = with maintainers; [ anthonyroussel ];

  };

pkgs/development/python-modules/aws-secretsmanager-caching/default.nix

+34 −17
Original line number Diff line number Diff line 
{ lib

, botocore

, buildPythonPackage

, pythonOlder

, fetchPypi

, pytestCheckHook

, pythonAtLeast

, pythonOlder

, setuptools

, setuptools-scm

, botocore

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "aws_secretsmanager_caching";

  pname = "aws-secretsmanager-caching";

  version = "1.1.1.5";

  format = "setuptools";

  pyprject = true;



  disabled = pythonOlder "3.7";



  src = fetchPypi {

    inherit pname version;

    sha256 = "5cee2762bb89b72f3e5123feee8e45fbe44ffe163bfca08b28f27b2e2b7772e1";

    pname = "aws_secretsmanager_caching";

    inherit version;

    hash = "sha256-XO4nYruJty8+USP+7o5F++RP/hY7/KCLKPJ7Lit3cuE=";

  };



  nativeBuildInputs = [

    setuptools-scm

  ];



  propagatedBuildInputs = [

    botocore

    setuptools  # Needs pkg_resources at runtime.

  ];



  patches = [

    # Remove coverage tests from the pytest invocation in setup.cfg.

    ./remove-coverage-tests.patch
@@ -36,9 +29,18 @@ buildPythonPackage rec { 


  postPatch = ''

    substituteInPlace setup.py \

      --replace "'pytest-runner'," ""

      --replace-fail "'pytest-runner'," ""

  '';



  nativeBuildInputs = [

    setuptools-scm

  ];



  propagatedBuildInputs = [

    botocore

    setuptools  # Needs pkg_resources at runtime.

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];
@@ -48,6 +50,21 @@ buildPythonPackage rec { 
    "test/integ"

  ];



  disabledTests = lib.optionals (pythonAtLeast "3.12") [

    # TypeError: 'float' object cannot be interpreted as an integer

    "test_calls_hook_binary"

    "test_calls_hook_string"

    "test_get_secret_binary"

    "test_get_secret_string"

    "test_invalid_json"

    "test_missing_key"

    "test_string_with_additional_kwargs"

    "test_string"

    "test_valid_json_with_mixed_args"

    "test_valid_json_with_no_secret_kwarg"

    "test_valid_json"

  ];



  pythonImportsCheck = [

    "aws_secretsmanager_caching"

  ];

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

+12 −10
Original line number Diff line number Diff line 
{ lib

, botocore

, buildPythonPackage

, pythonOlder

, fetchFromGitHub

, botocore

, jmespath

, s3transfer

, pytestCheckHook

, pythonOlder

, pythonRelaxDepsHook

, s3transfer

, setuptools

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "boto3";

  version = "1.34.21"; # N.B: if you change this, change botocore and awscli to a matching version

  format = "pyproject";

  version = "1.34.49"; # N.B: if you change this, change botocore and awscli to a matching version

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "boto";

    repo = pname;

    repo = "boto3";

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

    hash = "sha256-oOrUVBh1sbaOibU8A+bGZ4z7IEiE4gjHwZ+8889Hv60=";

    hash = "sha256-/pgbLSL5RJ5RrKUAfQ1QNJykBdICrpqnuziHOVHt1JI=";

  };



  nativeBuildInputs = [
@@ -54,14 +54,16 @@ buildPythonPackage rec { 
  ];



  passthru.optional-dependencies = {

    crt = [ botocore.optional-dependencies.crt ];

    crt = [

      botocore.optional-dependencies.crt

    ];

  };



  meta = with lib; {

    description = "AWS SDK for Python";

    homepage = "https://github.com/boto/boto3";

    changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst";

    license = licenses.asl20;

    description = "AWS SDK for Python";

    longDescription = ''

      Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for

      Python, which allows Python developers to write software that makes use of