public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90584 from endgame/update-aws-sam-cli

Browse Source 
aws-lambda-builders: 0.8.0 -> 0.9.0; aws-sam-cli: 0.44.0 -> 1.0.0rc1
This commit is contained in:
Frederik Rietdijk 2020-07-04 14:37:31 +02:00 committed by GitHub
commit 3bdebb0a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/aws-lambda-builders/default.nix
View File

@ -2,22 +2,24 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, six , six
, pathlib
, pytest , pytest
, mock , mock
, parameterized , parameterized
, isPy27
, isPy35 , isPy35
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-lambda-builders"; pname = "aws-lambda-builders";
version = "0.8.0"; version = "0.9.0";
# No tests available in PyPI tarball # No tests available in PyPI tarball
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = "aws-lambda-builders"; repo = "aws-lambda-builders";
rev = "v${version}"; rev = "v${version}";
sha256 = "1akiv92cd7ciky0aay94lh9azr73jajn0x0x6ywaf3qm5c4hyvys"; sha256 = "0cgb0hwf4xg5dmm32wwlxqy7a77jw6gpnj7v8rq5948hsy2sfrcp";
}; };
# Package is not compatible with Python 3.5 # Package is not compatible with Python 3.5
@ -25,7 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
six six
]; ] ++ lib.optionals isPy27 [ pathlib ];
checkInputs = [ checkInputs = [
pytest pytest

19
pkgs/development/tools/aws-sam-cli/default.nix
View File

@ -1,4 +1,5 @@
{ lib { fetchFromGitHub
, lib
, python , python
, enableTelemetry ? false , enableTelemetry ? false
}: }:
@ -6,6 +7,14 @@
let let
py = python.override { py = python.override {
packageOverrides = self: super: { packageOverrides = self: super: {
aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec {
version = "1.25.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "08756yl5lpqgrpr80f2b6bdcgygr37l6q1yygklcg9hz4yfpccav";
};
});
flask = super.flask.overridePythonAttrs (oldAttrs: rec { flask = super.flask.overridePythonAttrs (oldAttrs: rec {
version = "1.0.2"; version = "1.0.2";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -30,11 +39,11 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "aws-sam-cli"; pname = "aws-sam-cli";
version = "0.44.0"; version = "1.0.0rc1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0r3m41xjmg8m2jwsqwc9kdkcs3xbz8dsl240ybwbnr7rp29pnirf"; sha256 = "011b334gdvd9lhqia8c952q3cmzj99vik680180nbp0qh2xw6zpf";
}; };
# Tests are not included in the PyPI package # Tests are not included in the PyPI package
@ -66,9 +75,11 @@ buildPythonApplication rec {
# fix over-restrictive version bounds # fix over-restrictive version bounds
postPatch = '' postPatch = ''
substituteInPlace requirements/base.txt \ substituteInPlace requirements/base.txt \
--replace "boto3~=1.13.0, >=1.13.0" "boto3~=1.14.3" \
--replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \
--replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \
--replace "tomlkit==0.5.8" "tomlkit~=0.5.8" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \
--replace "tomlkit==0.5.8" "tomlkit~=0.6.0" \
--replace "requests==2.22.0" "requests~=2.22" --replace "requests==2.22.0" "requests~=2.22"
''; '';