commit 7c3dd9746143194c41d5f352e96d7af8a309bd39

+32 -25

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

··· 1 1 { lib 2 2 , buildPythonPackage 3 - , fetchPypi 3 + , fetchFromGitHub 4 4 , botocore 5 5 , jmespath 6 6 , s3transfer 7 - , futures ? null 8 - , docutils 9 - , nose 10 - , mock 11 - , isPy3k 7 + , setuptools 8 + , pytestCheckHook 12 9 }: 13 10 14 11 buildPythonPackage rec { 15 12 pname = "boto3"; 16 - version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version 13 + version = "1.26.38"; # N.B: if you change this, change botocore and awscli to a matching version 14 + format = "pyproject"; 17 15 18 - src = fetchPypi { 19 - inherit pname version; 20 - sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc="; 16 + src = fetchFromGitHub { 17 + owner = "boto"; 18 + repo = pname; 19 + rev = version; 20 + hash = "sha256-/QkR6gL0XkXofnFDcKa7J0ZbZbgT0IKnqtq2wcilbEs="; 21 21 }; 22 22 23 - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; 24 - checkInputs = [ docutils nose mock ]; 23 + propagatedBuildInputs = [ 24 + botocore 25 + jmespath 26 + s3transfer 27 + setuptools 28 + ]; 29 + 30 + doCheck = true; 25 31 26 - checkPhase = '' 27 - runHook preCheck 28 - # This method is not in mock. It might have appeared in some versions. 29 - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ 30 - tests/unit/resources/test_factory.py 31 - nosetests -d tests/unit --verbose 32 - runHook postCheck 33 - ''; 32 + checkInputs = [ 33 + pytestCheckHook 34 + ]; 34 35 35 - # Network access 36 - doCheck = false; 36 + pythonImportsCheck = [ 37 + "boto3" 38 + ]; 37 39 38 - pythonImportsCheck = [ "boto3" ]; 40 + disabledTestPaths = [ 41 + # Integration tests require networking 42 + "tests/integration" 43 + ]; 39 44 40 - meta = { 45 + meta = with lib; { 41 46 homepage = "https://github.com/boto/boto3"; 42 - license = lib.licenses.asl20; 47 + changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; 48 + license = licenses.asl20; 43 49 description = "AWS SDK for Python"; 44 50 longDescription = '' 45 51 Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for 46 52 Python, which allows Python developers to write software that makes use of 47 53 services like Amazon S3 and Amazon EC2. 48 54 ''; 55 + maintainers = with maintainers; [ anthonyroussel ]; 49 56 }; 50 57 }

+21 -13

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

··· 4 4 , python-dateutil 5 5 , jmespath 6 6 , docutils 7 - , simplejson 8 - , mock 9 - , nose 10 7 , urllib3 8 + , pytestCheckHook 9 + , jsonschema 11 10 }: 12 11 13 12 buildPythonPackage rec { 14 13 pname = "botocore"; 15 - version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version 14 + version = "1.29.38"; # N.B: if you change this, change boto3 and awscli to a matching version 16 15 17 16 src = fetchPypi { 18 17 inherit pname version; 19 - sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8="; 18 + hash = "sha256-K5jH2oZozcAitNila1BoZFTQoQwRUYcC/eQYgdIGGLY="; 20 19 }; 21 20 22 21 propagatedBuildInputs = [ 23 22 python-dateutil 24 23 jmespath 25 24 docutils 26 - simplejson 27 25 urllib3 28 26 ]; 29 27 30 - checkInputs = [ mock nose ]; 28 + checkInputs = [ 29 + pytestCheckHook 30 + jsonschema 31 + ]; 31 32 32 - checkPhase = '' 33 - nosetests -v 34 - ''; 33 + doCheck = true; 34 + 35 + disabledTestPaths = [ 36 + # Integration tests require networking 37 + "tests/integration" 35 38 36 - # Network access 37 - doCheck = false; 39 + # Disable slow tests (only run unit tests) 40 + "tests/functional" 41 + ]; 38 42 39 - pythonImportsCheck = [ "botocore" ]; 43 + pythonImportsCheck = [ 44 + "botocore" 45 + ]; 40 46 41 47 meta = with lib; { 42 48 homepage = "https://github.com/boto/botocore"; 49 + changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; 43 50 license = licenses.asl20; 44 51 description = "A low-level interface to a growing number of Amazon Web Services"; 52 + maintainers = with maintainers; [ anthonyroussel ]; 45 53 }; 46 54 }

+4 -9

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

··· 20 20 , openapi-spec-validator 21 21 , python-dateutil 22 22 , python-jose 23 - , pytz 24 23 , pyyaml 25 24 , requests 26 25 , responses ··· 37 36 38 37 buildPythonPackage rec { 39 38 pname = "moto"; 40 - version = "4.0.3"; 39 + version = "4.0.12"; 41 40 format = "setuptools"; 42 41 43 42 disabled = pythonOlder "3.6"; 44 43 45 44 src = fetchPypi { 46 45 inherit pname version; 47 - sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k="; 46 + hash = "sha256-MPjzFljxjNsV62JsjLOgdSDw2MIZMib7yzMmrhL7okY="; 48 47 }; 49 48 50 - postPatch = '' 51 - substituteInPlace setup.py \ 52 - --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5" 53 - ''; 54 - 55 49 propagatedBuildInputs = [ 56 50 aws-xray-sdk 57 51 boto3 ··· 68 62 openapi-spec-validator 69 63 python-dateutil 70 64 python-jose 71 - pytz 72 65 pyyaml 73 66 requests 74 67 responses ··· 139 132 "tests/test_awslambda/test_lambda_eventsourcemapping.py" 140 133 "tests/test_awslambda/test_lambda_invoke.py" 141 134 "tests/test_batch/test_batch_jobs.py" 135 + "tests/test_kinesis/test_kinesis.py" 136 + "tests/test_kinesis/test_kinesis_stream_consumers.py" 142 137 ]; 143 138 144 139 disabledTests = [

+3 -2

pkgs/tools/admin/awscli/default.nix

··· 28 28 in 29 29 with py.pkgs; buildPythonApplication rec { 30 30 pname = "awscli"; 31 - version = "1.25.76"; # N.B: if you change this, change botocore and boto3 to a matching version too 31 + version = "1.27.38"; # N.B: if you change this, change botocore and boto3 to a matching version too 32 32 33 33 src = fetchPypi { 34 34 inherit pname version; 35 - hash = "sha256-PSr0zZEGXFxcFSN7QQ5Ux0Z4aCwwm9na+2hIv/gR6+s="; 35 + hash = "sha256-SjeFBWwfd+9sXcZL9NdqFyuBIQtql3KB3lnygeVVHU0="; 36 36 }; 37 37 38 38 # https://github.com/aws/aws-cli/issues/4837 ··· 82 82 83 83 meta = with lib; { 84 84 homepage = "https://aws.amazon.com/cli/"; 85 + changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; 85 86 description = "Unified tool to manage your AWS services"; 86 87 license = licenses.asl20; 87 88 mainProgram = "aws";

+1 -1

pkgs/tools/virtualization/awsebcli/default.nix

··· 49 49 substituteInPlace setup.py \ 50 50 --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ 51 51 --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ 52 - --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \ 52 + --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ 53 53 --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ 54 54 --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ 55 55 --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0"