Merge pull request #154861 from fabaff/bump-serverlessrepo

python310Packages.serverlessrepo: relax dependency constraints

authored by Fabian Affolter and committed by GitHub c82adf9e 9e73373e

+33 -15
+22 -5
pkgs/development/python-modules/serverlessrepo/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , pytest 4 + , pytestCheckHook 5 5 , boto3 6 6 , six 7 7 , pyyaml 8 8 , mock 9 + , pythonOlder 9 10 }: 10 11 11 12 buildPythonPackage rec { 12 13 pname = "serverlessrepo"; 13 14 version = "0.1.10"; 15 + format = "setuptools"; 16 + 17 + disabled = pythonOlder "3.7"; 14 18 15 19 src = fetchPypi { 16 20 inherit pname version; ··· 23 27 pyyaml 24 28 ]; 25 29 26 - checkInputs = [ pytest mock ]; 30 + checkInputs = [ 31 + pytestCheckHook 32 + mock 33 + ]; 27 34 28 - checkPhase = '' 29 - pytest tests/unit 35 + postPatch = '' 36 + substituteInPlace setup.py \ 37 + --replace "pyyaml~=5.1" "pyyaml" \ 38 + --replace "boto3~=1.9, >=1.9.56" "boto3" 30 39 ''; 31 40 41 + pytestFlagsArray = [ 42 + "tests/unit" 43 + ]; 44 + 45 + pythonImportsCheck = [ 46 + "serverlessrepo" 47 + ]; 48 + 32 49 meta = with lib; { 33 50 homepage = "https://github.com/awslabs/aws-serverlessrepo-python"; 34 51 description = "Helpers for working with the AWS Serverless Application Repository"; ··· 36 53 A Python library with convenience helpers for working with the 37 54 AWS Serverless Application Repository. 38 55 ''; 39 - license = lib.licenses.asl20; 56 + license = licenses.asl20; 40 57 maintainers = with maintainers; [ dhkl ]; 41 58 }; 42 59 }
+11 -10
pkgs/development/tools/aws-sam-cli/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "aws-sam-cli"; 8 - version = "1.36.0"; 8 + version = "1.37.0"; 9 9 10 10 src = python3.pkgs.fetchPypi { 11 11 inherit pname version; 12 - sha256 = "sha256-GJbBhe1l25ZHGWVu1o2oJvd/BNv8dv7aIYor/ebFl9U="; 12 + hash = "sha256-XE3g2mKwAiaJvi0ShVScnCKrmz7ujaQgOeFXuYwtP4g="; 13 13 }; 14 - 15 - # Tests are not included in the PyPI package 16 - doCheck = false; 17 14 18 15 propagatedBuildInputs = with python3.pkgs; [ 19 16 aws-lambda-builders ··· 42 39 # fix over-restrictive version bounds 43 40 postPatch = '' 44 41 substituteInPlace requirements/base.txt \ 42 + --replace "aws_lambda_builders==" "aws-lambda-builders #" \ 45 43 --replace "click~=7.1" "click~=8.0" \ 46 - --replace "Flask~=1.1.2" "Flask~=2.0" \ 47 44 --replace "dateparser~=1.0" "dateparser>=0.7" \ 48 45 --replace "docker~=4.2.0" "docker>=4.2.0" \ 46 + --replace "Flask~=1.1.2" "Flask~=2.0" \ 47 + --replace "PyYAML~=5.3" "PyYAML" \ 48 + --replace "regex==" "regex #" \ 49 49 --replace "requests==" "requests #" \ 50 - --replace "watchdog==" "watchdog #" \ 51 - --replace "aws_lambda_builders==" "aws-lambda-builders #" \ 52 50 --replace "typing_extensions==" "typing-extensions #" \ 53 - --replace "regex==" "regex #" \ 54 - --replace "tzlocal==3.0" "tzlocal" 51 + --replace "tzlocal==3.0" "tzlocal" \ 52 + --replace "watchdog==" "watchdog #" 55 53 ''; 54 + 55 + # Tests are not included in the PyPI package 56 + doCheck = false; 56 57 57 58 meta = with lib; { 58 59 homepage = "https://github.com/awslabs/aws-sam-cli";