From 169edc2a2cefb34bfeb6edc41405f1df99cde3f7 Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Fri, 23 Aug 2019 13:54:15 -0700 Subject: [PATCH 1/4] feat: reproducable builds - using pipenv to create a new requirements.txt thats pinned. Run `pipenv lock -r` to generate a requirements.txt --- Pipfile | 28 +++ Pipfile.lock | 383 ++++++++++++++++++++++++++++++++++++++++++ requirements/base.txt | 52 ++++-- 3 files changed, 450 insertions(+), 13 deletions(-) create mode 100644 Pipfile create mode 100644 Pipfile.lock diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000000..9772927ac7 --- /dev/null +++ b/Pipfile @@ -0,0 +1,28 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +six = "~=1.11.0" +chevron = "~=0.12" +click = "~=7.0" +enum34 = "~=1.1.6" +boto3 = ">=1.9.56,~=1.9" +cookiecutter = "~=1.6.0" +aws-sam-translator = "==1.13.1" +docker = "~=4.0" +dateparser = "~=0.7" +python-dateutil = "~=2.6" +pathlib2 = "~=2.3.2" +requests = "==2.22.0" +serverlessrepo = "==0.1.9" +aws-lambda-builders = "==0.3.0" +Flask = "~=1.0.2" +PyYAML = "~=5.1" +aws-sam-cli = {editable = true,path = "."} + +[requires] +python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000000..27911bd789 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,383 @@ +{ + "_meta": { + "hash": { + "sha256": "de729ce59bab9a5e130b2cc353d3e4f55310b95a7708848d1cf63e3741df5063" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.7" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "arrow": { + "hashes": [ + "sha256:0186026cfd94ca4fb773f30cc5398289a3027480d335e0e5c0d2772643763137", + "sha256:a12de0124d812d15061ed36c7eb4a421fa1b95026a502a0b2062e9ea00fc4446" + ], + "version": "==0.14.5" + }, + "attrs": { + "hashes": [ + "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", + "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" + ], + "version": "==19.1.0" + }, + "aws-lambda-builders": { + "hashes": [ + "sha256:427724b039409a05a706a3f8125cb88c3901527b1192f4da2588714103f68b08", + "sha256:9222fc6d6ac481bf5fa1849e2ae2b353eb38d310eea76606824c971b39482705", + "sha256:e7c06c79a9f031a461b00a7241396115cf3e5bed0db0d6c9763cfb2cde7779dd" + ], + "index": "pypi", + "version": "==0.3.0" + }, + "aws-sam-cli": { + "editable": true, + "path": "." + }, + "aws-sam-translator": { + "hashes": [ + "sha256:9b7b40ba50a2befe255e48549d8a4bb6c63490cf4c0b1f3f2e6a6f25b5723483" + ], + "index": "pypi", + "version": "==1.13.1" + }, + "binaryornot": { + "hashes": [ + "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061", + "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4" + ], + "version": "==0.4.4" + }, + "boto3": { + "hashes": [ + "sha256:3a8a8af144df27643f5e444ae437b5bc45e94b37de15dabb5bb799a0205f1d8f", + "sha256:dacfd1651860eda526abaeb5f9eee2063043a75d4c555cc7b0c22a7989bf88cd" + ], + "index": "pypi", + "version": "==1.9.213" + }, + "botocore": { + "hashes": [ + "sha256:14ab8371f883c47348e749c4d8773366dd2cc549038e9eaabe21fb1d05bca7b5", + "sha256:b76a264c0781e4f19138617e4201e8e67fa6dd331db32f4b6273fc18a433f4ec" + ], + "version": "==1.12.213" + }, + "certifi": { + "hashes": [ + "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939", + "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" + ], + "version": "==2019.6.16" + }, + "chardet": { + "hashes": [ + "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", + "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + ], + "version": "==3.0.4" + }, + "chevron": { + "hashes": [ + "sha256:95b0a055ef0ada5eb061d60be64a7f70670b53372ccd221d1b88adf1c41a9094", + "sha256:f95054a8b303268ebf3efd6bdfc8c1b428d3fc92327913b4e236d062ec61c989" + ], + "index": "pypi", + "version": "==0.13.1" + }, + "click": { + "hashes": [ + "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", + "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" + ], + "index": "pypi", + "version": "==7.0" + }, + "cookiecutter": { + "hashes": [ + "sha256:1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e", + "sha256:ed8f54a8fc79b6864020d773ce11539b5f08e4617f353de1f22d23226f6a0d36" + ], + "index": "pypi", + "version": "==1.6.0" + }, + "dateparser": { + "hashes": [ + "sha256:42d51be54e74a8e80a4d76d1fa6e4edd997098fce24ad2d94a2eab5ef247193e", + "sha256:78124c458c461ea7198faa3c038f6381f37588b84bb42740e91a4cbd260b1d09" + ], + "index": "pypi", + "version": "==0.7.1" + }, + "docker": { + "hashes": [ + "sha256:acf51b5e3e0d056925c3b780067a6f753c915fffaa46c5f2d79eb0fc1cbe6a01", + "sha256:cc5b2e94af6a2b1e1ed9d7dcbdc77eff56c36081757baf9ada6e878ea0213164" + ], + "index": "pypi", + "version": "==4.0.2" + }, + "docutils": { + "hashes": [ + "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", + "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", + "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + ], + "version": "==0.15.2" + }, + "enum34": { + "hashes": [ + "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", + "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", + "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", + "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" + ], + "index": "pypi", + "version": "==1.1.6" + }, + "flask": { + "hashes": [ + "sha256:1a21ccca71cee5e55b6a367cc48c6eb47e3c447f76e64d41f3f3f931c17e7c96", + "sha256:ed1330220a321138de53ec7c534c3d90cf2f7af938c7880fc3da13aa46bf870f" + ], + "index": "pypi", + "version": "==1.0.4" + }, + "future": { + "hashes": [ + "sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8" + ], + "version": "==0.17.1" + }, + "idna": { + "hashes": [ + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" + ], + "version": "==2.8" + }, + "itsdangerous": { + "hashes": [ + "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", + "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" + ], + "version": "==1.1.0" + }, + "jinja2": { + "hashes": [ + "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", + "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" + ], + "version": "==2.10.1" + }, + "jinja2-time": { + "hashes": [ + "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40", + "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa" + ], + "version": "==0.2.0" + }, + "jmespath": { + "hashes": [ + "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", + "sha256:bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c" + ], + "version": "==0.9.4" + }, + "jsonschema": { + "hashes": [ + "sha256:5f9c0a719ca2ce14c5de2fd350a64fd2d13e8539db29836a86adc990bb1a068f", + "sha256:8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" + ], + "version": "==3.0.2" + }, + "markupsafe": { + "hashes": [ + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", + "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", + "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", + "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", + "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", + "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", + "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", + "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", + "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", + "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", + "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", + "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" + ], + "version": "==1.1.1" + }, + "pathlib2": { + "hashes": [ + "sha256:2156525d6576d21c4dcaddfa427fae887ef89a7a9de5cbfe0728b3aafa78427e", + "sha256:446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8" + ], + "index": "pypi", + "version": "==2.3.4" + }, + "poyo": { + "hashes": [ + "sha256:3e2ca8e33fdc3c411cd101ca395668395dd5dc7ac775b8e809e3def9f9fe041a", + "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd" + ], + "version": "==0.5.0" + }, + "pyrsistent": { + "hashes": [ + "sha256:34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" + ], + "version": "==0.15.4" + }, + "python-dateutil": { + "hashes": [ + "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", + "sha256:c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e" + ], + "index": "pypi", + "version": "==2.8.0" + }, + "pytz": { + "hashes": [ + "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32", + "sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7" + ], + "version": "==2019.2" + }, + "pyyaml": { + "hashes": [ + "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", + "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", + "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", + "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", + "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", + "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", + "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", + "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", + "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", + "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", + "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", + "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", + "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8" + ], + "index": "pypi", + "version": "==5.1.2" + }, + "regex": { + "hashes": [ + "sha256:1e9f9bc44ca195baf0040b1938e6801d2f3409661c15fe57f8164c678cfc663f", + "sha256:587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849", + "sha256:835ccdcdc612821edf132c20aef3eaaecfb884c9454fdc480d5887562594ac61", + "sha256:93f6c9da57e704e128d90736430c5c59dd733327882b371b0cae8833106c2a21", + "sha256:a46f27d267665016acb3ec8c6046ec5eae8cf80befe85ba47f43c6f5ec636dcd", + "sha256:c5c8999b3a341b21ac2c6ec704cfcccbc50f1fedd61b6a8ee915ca7fd4b0a557", + "sha256:d4d1829cf97632673aa49f378b0a2c3925acd795148c5ace8ef854217abbee89", + "sha256:d96479257e8e4d1d7800adb26bf9c5ca5bab1648a1eddcac84d107b73dc68327", + "sha256:f20f4912daf443220436759858f96fefbfc6c6ba9e67835fd6e4e9b73582791a", + "sha256:f2b37b5b2c2a9d56d9e88efef200ec09c36c7f323f9d58d0b985a90923df386d", + "sha256:fe765b809a1f7ce642c2edeee351e7ebd84391640031ba4b60af8d91a9045890" + ], + "version": "==2019.8.19" + }, + "requests": { + "hashes": [ + "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", + "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" + ], + "index": "pypi", + "version": "==2.22.0" + }, + "s3transfer": { + "hashes": [ + "sha256:6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d", + "sha256:b780f2411b824cb541dbcd2c713d0cb61c7d1bcadae204cdddda2b35cef493ba" + ], + "version": "==0.2.1" + }, + "serverlessrepo": { + "hashes": [ + "sha256:0c340d0e4437b5043eed2f2aafcb8fd6b16ab3d62ace19e70186542f4f7ac0f5", + "sha256:7b58bd86f4ef1d0189fdaee17b7a322c59ef5bbf5373a3d2ceaf440886e35236" + ], + "index": "pypi", + "version": "==0.1.9" + }, + "six": { + "hashes": [ + "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", + "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + ], + "index": "pypi", + "version": "==1.11.0" + }, + "tzlocal": { + "hashes": [ + "sha256:11c9f16e0a633b4b60e1eede97d8a46340d042e67b670b290ca526576e039048", + "sha256:949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590" + ], + "version": "==2.0.0" + }, + "urllib3": { + "hashes": [ + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" + ], + "markers": "python_version >= '3.4'", + "version": "==1.25.3" + }, + "websocket-client": { + "hashes": [ + "sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9", + "sha256:1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a" + ], + "version": "==0.56.0" + }, + "werkzeug": { + "hashes": [ + "sha256:87ae4e5b5366da2347eb3116c0e6c681a0e939a33b2805e2c0cbd282664932c4", + "sha256:a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6" + ], + "version": "==0.15.5" + }, + "wheel": { + "hashes": [ + "sha256:10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646", + "sha256:f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28" + ], + "version": "==0.33.6" + }, + "whichcraft": { + "hashes": [ + "sha256:0acf1d3aebb5ab16243edbf818024ce21938f06150563041665a23b33eb11dd8", + "sha256:d54caa14cc3f7b1d2276f8753fd05f1dc5a554df6f83a36c5c2a551e81de2498" + ], + "version": "==0.6.0" + } + }, + "develop": {} +} diff --git a/requirements/base.txt b/requirements/base.txt index fff8a7e1c5..4bef70383e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,16 +1,42 @@ -six~=1.11.0 -chevron~=0.12 -click~=7.0 -enum34~=1.1.6; python_version<"3.4" -Flask~=1.0.2 -boto3~=1.9, >=1.9.56 -PyYAML~=5.1 -cookiecutter~=1.6.0 +arrow==0.14.5 +attrs==19.1.0 +aws-lambda-builders==0.3.0 aws-sam-translator==1.13.1 -docker~=4.0 -dateparser~=0.7 -python-dateutil~=2.6 -pathlib2~=2.3.2; python_version<"3.4" +binaryornot==0.4.4 +boto3==1.9.213 +botocore==1.12.213 +certifi==2019.6.16 +chardet==3.0.4 +chevron==0.13.1 +click==7.0 +cookiecutter==1.6.0 +dateparser==0.7.1 +docker==4.0.2 +docutils==0.15.2 +enum34==1.1.6 +flask==1.0.4 +future==0.17.1 +idna==2.8 +itsdangerous==1.1.0 +jinja2-time==0.2.0 +jinja2==2.10.1 +jmespath==0.9.4 +jsonschema==3.0.2 +markupsafe==1.1.1 +pathlib2==2.3.4 +poyo==0.5.0 +pyrsistent==0.15.4 +python-dateutil==2.8.0 +pytz==2019.2 +pyyaml==5.1.2 +regex==2019.8.19 requests==2.22.0 +s3transfer==0.2.1 serverlessrepo==0.1.9 -aws_lambda_builders==0.3.0 +six==1.11.0 +tzlocal==2.0.0 +urllib3==1.25.3 ; python_version >= '3.4' +websocket-client==0.56.0 +werkzeug==0.15.5 +wheel==0.33.6 +whichcraft==0.6.0 From 54d7715b111600148c489ab7a0b657479daceb6d Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Fri, 23 Aug 2019 14:49:20 -0700 Subject: [PATCH 2/4] fix: make pr --- Pipfile | 67 +++++++++--- Pipfile.lock | 229 +++++++++++++++++++++++++++++++++++++++++- requirements/base.txt | 1 - requirements/dev.txt | 31 +++--- 4 files changed, 298 insertions(+), 30 deletions(-) diff --git a/Pipfile b/Pipfile index 9772927ac7..97cb5bfd28 100644 --- a/Pipfile +++ b/Pipfile @@ -4,25 +4,68 @@ url = "https://pypi.org/simple" verify_ssl = true [dev-packages] +coverage = "==4.3.4" +flake8 = "==3.3.0" +tox = "==2.2.1" +pytest-cov = "==2.4.0" +# astroid > 2.0.4 is not compatible with pylint1.7 +astroid = "==2.0.3" +pylint = "==1.7.2" + +# Test requirements +pytest = "==3.0.7" +py = "==1.4.33" +mock = "==2.0.0" +parameterized= "==0.6.1" +# pathlib2==2.3.2; python_version<"3.4" +# futures==3.2.0; python_version<"3.2.3" +# Py3.2 backport +# backports.tempfile==1.0 + [packages] -six = "~=1.11.0" -chevron = "~=0.12" -click = "~=7.0" -enum34 = "~=1.1.6" -boto3 = ">=1.9.56,~=1.9" -cookiecutter = "~=1.6.0" +six = "==1.11.0" +chevron = "==0.13.1" +click = "==7.0" +enum34 = "==1.1.6" +boto3 = "==1.9.213" +cookiecutter = "==1.6.0" aws-sam-translator = "==1.13.1" -docker = "~=4.0" -dateparser = "~=0.7" -python-dateutil = "~=2.6" -pathlib2 = "~=2.3.2" +docker = "==4.0.2" +dateparser = "==0.7.1" +python-dateutil = "==2.8.0" +pathlib2 = "==2.3.4" requests = "==2.22.0" serverlessrepo = "==0.1.9" aws-lambda-builders = "==0.3.0" -Flask = "~=1.0.2" -PyYAML = "~=5.1" +Flask = "==1.0.4" +PyYAML = "==5.1.2" aws-sam-cli = {editable = true,path = "."} +arrow = "==0.14.5" +attrs = "==19.1.0" +binaryornot = "==0.4.4" +botocore = "==1.12.213" +certifi = "==2019.6.16" +chardet = "==3.0.4" +docutils = "==0.15.2" +future = "==0.17.1" +idna = "==2.8" +itsdangerous = "==1.1.0" +jinja2-time = "==0.2.0" +jmespath = "==0.9.4" +jsonschema = "==3.0.2" +poyo = "==0.5.0" +pyrsistent = "==0.15.4" +pytz = "==2019.2" +regex = "==2019.8.19" +s3transfer = "==0.2.1" +tzlocal = "==2.0.0" +urllib3 = "==1.25.3" +whichcraft = "==0.6.0" +Jinja2 = "==2.10.1" +MarkupSafe = "==1.1.1" +websocket_client = "==0.56.0" +Werkzeug = "==0.15.5" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 27911bd789..0f5ae8a20e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "de729ce59bab9a5e130b2cc353d3e4f55310b95a7708848d1cf63e3741df5063" + "sha256": "634ec977c08ca082c137711c0ee434f60131901b9432af96e1d91d01383af1bf" }, "pipfile-spec": 6, "requires": { @@ -21,6 +21,7 @@ "sha256:0186026cfd94ca4fb773f30cc5398289a3027480d335e0e5c0d2772643763137", "sha256:a12de0124d812d15061ed36c7eb4a421fa1b95026a502a0b2062e9ea00fc4446" ], + "index": "pypi", "version": "==0.14.5" }, "attrs": { @@ -28,6 +29,7 @@ "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" ], + "index": "pypi", "version": "==19.1.0" }, "aws-lambda-builders": { @@ -55,6 +57,7 @@ "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061", "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4" ], + "index": "pypi", "version": "==0.4.4" }, "boto3": { @@ -70,6 +73,7 @@ "sha256:14ab8371f883c47348e749c4d8773366dd2cc549038e9eaabe21fb1d05bca7b5", "sha256:b76a264c0781e4f19138617e4201e8e67fa6dd331db32f4b6273fc18a433f4ec" ], + "index": "pypi", "version": "==1.12.213" }, "certifi": { @@ -77,6 +81,7 @@ "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939", "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" ], + "index": "pypi", "version": "==2019.6.16" }, "chardet": { @@ -84,6 +89,7 @@ "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" ], + "index": "pypi", "version": "==3.0.4" }, "chevron": { @@ -132,6 +138,7 @@ "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" ], + "index": "pypi", "version": "==0.15.2" }, "enum34": { @@ -156,6 +163,7 @@ "hashes": [ "sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8" ], + "index": "pypi", "version": "==0.17.1" }, "idna": { @@ -163,6 +171,7 @@ "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], + "index": "pypi", "version": "==2.8" }, "itsdangerous": { @@ -170,6 +179,7 @@ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" ], + "index": "pypi", "version": "==1.1.0" }, "jinja2": { @@ -177,6 +187,7 @@ "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" ], + "index": "pypi", "version": "==2.10.1" }, "jinja2-time": { @@ -184,6 +195,7 @@ "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40", "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa" ], + "index": "pypi", "version": "==0.2.0" }, "jmespath": { @@ -191,6 +203,7 @@ "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", "sha256:bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c" ], + "index": "pypi", "version": "==0.9.4" }, "jsonschema": { @@ -198,6 +211,7 @@ "sha256:5f9c0a719ca2ce14c5de2fd350a64fd2d13e8539db29836a86adc990bb1a068f", "sha256:8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" ], + "index": "pypi", "version": "==3.0.2" }, "markupsafe": { @@ -231,6 +245,7 @@ "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" ], + "index": "pypi", "version": "==1.1.1" }, "pathlib2": { @@ -246,12 +261,14 @@ "sha256:3e2ca8e33fdc3c411cd101ca395668395dd5dc7ac775b8e809e3def9f9fe041a", "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd" ], + "index": "pypi", "version": "==0.5.0" }, "pyrsistent": { "hashes": [ "sha256:34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" ], + "index": "pypi", "version": "==0.15.4" }, "python-dateutil": { @@ -267,6 +284,7 @@ "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32", "sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7" ], + "index": "pypi", "version": "==2019.2" }, "pyyaml": { @@ -302,6 +320,7 @@ "sha256:f2b37b5b2c2a9d56d9e88efef200ec09c36c7f323f9d58d0b985a90923df386d", "sha256:fe765b809a1f7ce642c2edeee351e7ebd84391640031ba4b60af8d91a9045890" ], + "index": "pypi", "version": "==2019.8.19" }, "requests": { @@ -317,6 +336,7 @@ "sha256:6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d", "sha256:b780f2411b824cb541dbcd2c713d0cb61c7d1bcadae204cdddda2b35cef493ba" ], + "index": "pypi", "version": "==0.2.1" }, "serverlessrepo": { @@ -340,6 +360,7 @@ "sha256:11c9f16e0a633b4b60e1eede97d8a46340d042e67b670b290ca526576e039048", "sha256:949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590" ], + "index": "pypi", "version": "==2.0.0" }, "urllib3": { @@ -347,7 +368,7 @@ "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" ], - "markers": "python_version >= '3.4'", + "index": "pypi", "version": "==1.25.3" }, "websocket-client": { @@ -355,6 +376,7 @@ "sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9", "sha256:1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a" ], + "index": "pypi", "version": "==0.56.0" }, "werkzeug": { @@ -362,6 +384,7 @@ "sha256:87ae4e5b5366da2347eb3116c0e6c681a0e939a33b2805e2c0cbd282664932c4", "sha256:a13b74dd3c45f758d4ebdb224be8f1ab8ef58b3c0ffc1783a8c7d9f4f50227e6" ], + "index": "pypi", "version": "==0.15.5" }, "wheel": { @@ -376,8 +399,208 @@ "sha256:0acf1d3aebb5ab16243edbf818024ce21938f06150563041665a23b33eb11dd8", "sha256:d54caa14cc3f7b1d2276f8753fd05f1dc5a554df6f83a36c5c2a551e81de2498" ], + "index": "pypi", "version": "==0.6.0" } }, - "develop": {} + "develop": { + "astroid": { + "hashes": [ + "sha256:57152b96d17e8e2026255987a43b4d860bc23814fb1709ae9b25cdad37c45a02", + "sha256:e6dbe13f4afe364c323ba605e0027dc29b5a301a4dace2ff02c17cae891c1d8c" + ], + "index": "pypi", + "version": "==2.0.3" + }, + "coverage": { + "hashes": [ + "sha256:01406019418aabb2d4741647cc79b0e0deb0b8c5a6f936936c303e2f82ec8e5b", + "sha256:01a07b2b9212d4da3a1294436b58ac53f1d7aa445bda666648a5357048dc7ef3", + "sha256:024682371464c6e3caa975aba12b4d5428f35613489340fce1334c74d590a057", + "sha256:07c15c4a2287116a41d5966f1f5a7be765640c2e5a1917f882850a24615db6d3", + "sha256:1d23dea598fb4d61a8577d0eb0cb2b7932db0c8d2e1394088ad5f64e3fe1febf", + "sha256:1eeb9de833c3b976ee118a8d838af437bfa596bf60a5bf0705f4370e6d181a52", + "sha256:229ab9c0d53c55d698b8784d53077bef7a5f1fb5d27e90dc7b6f91243b024513", + "sha256:2f5a8bf29bdc69976d0913745daab11f8265e46ec41153f5e1e1794088019dad", + "sha256:2f959bc1b40a3ef2c5f0c7bc282226d6d4bd585b239bcce321013afc18ff0a0f", + "sha256:36407249a0b6669c6ad4425b0f29685579df745480c03afa70f101f09f4eead3", + "sha256:3efa49e3da8f32071ee3d5d464cc6b6f8818524d4099b4a94b86a70b8c88d4f5", + "sha256:422bcc6270e1c0cd9043048ce244f49072e9bd78a2c028c2ad2cfd58c79f5936", + "sha256:4fa2b181c3bf94cfdf841148d5d9abcab1890188dd908a639bcf7a38c50092bc", + "sha256:57c0c217270e628380f4befbbf8c5312b88ba7d81fd3d1b2218a25a2608f603c", + "sha256:6ae76a6cd594107ad45525278e8addeae4628a59c8cde3999548d7fe1646465b", + "sha256:6d3c762c87062a29771015f942752caef42fcc7fe4be2b03186f96788242290c", + "sha256:8a82664931a071399d703d65af2521e2202b34f2d8db20fa22a922fec0339022", + "sha256:8b282292973a1dc4eccfcc0776e0fde75b5b3de2e35164c2d854f7dd80149e4b", + "sha256:9a7874ca91cee8714277cd6d1b52374809ab925bf6ae92607bf02509019caadb", + "sha256:9c3e6551597593c1afedcbccf1371995f94457aea82cac726d1f3a25f4507386", + "sha256:a791068e1bbe443fcd3179b1c180c27a7fc58c1554b0d10311b7659d2d2d76f5", + "sha256:adf04843188418b012dd1974e397a7ac3faa1855cbcd69083e3af4da6de9dd81", + "sha256:adfbbd4a1d22fd77b13ff992946b19873407e035504abe9ba537494fe013300f", + "sha256:b25aa3531220faaf1727fc29bc000798476b4a30f429dc07898d5da48caefa15", + "sha256:c12f34c0b50e9e8bf8c049b6c8ca59929c33cea4b1c48362c99c36838c1ee025", + "sha256:c736faa1688222a6c8a5d8be4b66ec373ad6dab27fced8ca0d2c80fed70ac6e3", + "sha256:ca36d83cd591d027952e5019149c4386e7058cd674bf8cb52dc622f768d689e9", + "sha256:e1fb21a807aa0b5cc79806d8ef09078acaa83f994e15f0f7277489ca8eda51b7", + "sha256:e53199ae110cb7e250dd5505fde34452514f4eb2f1fb7532270d2ea037454b09", + "sha256:ea9808001dcf34d368cbef430e7885fdc76a2cf8ea96a8ed8b653797dd9555bb", + "sha256:eaaefe0f6aa33de5a65f48dd0040d7fe08cac9ac6c35a56d0a7db109c3e733df", + "sha256:f27772c9ee88ed3f2a784181f3d1724561499e7e448ed1706153336baa706bd5", + "sha256:f99066d76274800145a2e658026b30962eb5079346249197e88b55c9a7855e6a", + "sha256:fd3373ccd561b79932d12a986674e642816cfc4db4507b6a22ab30c318a85429" + ], + "index": "pypi", + "version": "==4.3.4" + }, + "flake8": { + "hashes": [ + "sha256:83905eadba99f73fbfe966598aaf1682b3eb6755d2263c5b33a4e8367d60b0d1", + "sha256:b907a26dcf5580753d8f80f1be0ec1d5c45b719f7bac441120793d1a70b03f12" + ], + "index": "pypi", + "version": "==3.3.0" + }, + "isort": { + "hashes": [ + "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1", + "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd" + ], + "version": "==4.3.21" + }, + "lazy-object-proxy": { + "hashes": [ + "sha256:02b260c8deb80db09325b99edf62ae344ce9bc64d68b7a634410b8e9a568edbf", + "sha256:18f9c401083a4ba6e162355873f906315332ea7035803d0fd8166051e3d402e3", + "sha256:1f2c6209a8917c525c1e2b55a716135ca4658a3042b5122d4e3413a4030c26ce", + "sha256:2f06d97f0ca0f414f6b707c974aaf8829c2292c1c497642f63824119d770226f", + "sha256:616c94f8176808f4018b39f9638080ed86f96b55370b5a9463b2ee5c926f6c5f", + "sha256:63b91e30ef47ef68a30f0c3c278fbfe9822319c15f34b7538a829515b84ca2a0", + "sha256:77b454f03860b844f758c5d5c6e5f18d27de899a3db367f4af06bec2e6013a8e", + "sha256:83fe27ba321e4cfac466178606147d3c0aa18e8087507caec78ed5a966a64905", + "sha256:84742532d39f72df959d237912344d8a1764c2d03fe58beba96a87bfa11a76d8", + "sha256:874ebf3caaf55a020aeb08acead813baf5a305927a71ce88c9377970fe7ad3c2", + "sha256:9f5caf2c7436d44f3cec97c2fa7791f8a675170badbfa86e1992ca1b84c37009", + "sha256:a0c8758d01fcdfe7ae8e4b4017b13552efa7f1197dd7358dc9da0576f9d0328a", + "sha256:a4def978d9d28cda2d960c279318d46b327632686d82b4917516c36d4c274512", + "sha256:ad4f4be843dace866af5fc142509e9b9817ca0c59342fdb176ab6ad552c927f5", + "sha256:ae33dd198f772f714420c5ab698ff05ff900150486c648d29951e9c70694338e", + "sha256:b4a2b782b8a8c5522ad35c93e04d60e2ba7f7dcb9271ec8e8c3e08239be6c7b4", + "sha256:c462eb33f6abca3b34cdedbe84d761f31a60b814e173b98ede3c81bb48967c4f", + "sha256:fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1" + ], + "version": "==1.4.2" + }, + "mccabe": { + "hashes": [ + "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" + ], + "version": "==0.6.1" + }, + "mock": { + "hashes": [ + "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", + "sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba" + ], + "index": "pypi", + "version": "==2.0.0" + }, + "parameterized": { + "hashes": [ + "sha256:caf58e717097735de0d7e15386a46ffa5ce25bb6a13a43716a8854a8d34841e2", + "sha256:cf5fa4f295dfb823cebdb27a00566113f2fbb71c7d5ca7b7a1019fd20c8a0811" + ], + "index": "pypi", + "version": "==0.6.1" + }, + "pbr": { + "hashes": [ + "sha256:56e52299170b9492513c64be44736d27a512fa7e606f21942160b68ce510b4bc", + "sha256:9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" + ], + "version": "==5.4.2" + }, + "pluggy": { + "hashes": [ + "sha256:159cc783e056c07da6552aa5aef6b1e6c0064b4f18bd49c531fd2d40aafb0ea3", + "sha256:48096d7015b8d87a83fc064e8b5cc61ea2e235f1b86dd67889d8d53257f350c6" + ], + "version": "==0.3.1" + }, + "py": { + "hashes": [ + "sha256:1f9a981438f2acc20470b301a07a496375641f902320f70e31916fe3377385a9", + "sha256:81b5e37db3cc1052de438375605fb5d3b3e97f950f415f9143f04697c684d7eb" + ], + "index": "pypi", + "version": "==1.4.33" + }, + "pycodestyle": { + "hashes": [ + "sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766", + "sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9" + ], + "version": "==2.3.1" + }, + "pyflakes": { + "hashes": [ + "sha256:aa0d4dff45c0cc2214ba158d29280f8fa1129f3e87858ef825930845146337f4", + "sha256:cc5eadfb38041f8366128786b4ca12700ed05bbf1403d808e89d57d67a3875a7" + ], + "version": "==1.5.0" + }, + "pylint": { + "hashes": [ + "sha256:c7a3ee11db42d00334671b778f042793c837b73f5883132158284b7dbd6f8184", + "sha256:ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69" + ], + "index": "pypi", + "version": "==1.7.2" + }, + "pytest": { + "hashes": [ + "sha256:66f332ae62593b874a648b10a8cb106bfdacd2c6288ed7dec3713c3a808a6017", + "sha256:b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab" + ], + "index": "pypi", + "version": "==3.0.7" + }, + "pytest-cov": { + "hashes": [ + "sha256:10e37e876f49ddec80d6c83a54b657157f1387ebc0f7755285f8c156130014a1", + "sha256:53d4179086e1eec1c688705977387432c01031b0a7bd91b8ff6c912c08c3820d" + ], + "index": "pypi", + "version": "==2.4.0" + }, + "six": { + "hashes": [ + "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", + "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + ], + "index": "pypi", + "version": "==1.11.0" + }, + "tox": { + "hashes": [ + "sha256:70d97dddd44b063d15c6ebd956deea8623e62839ac652e00e85d29b97dc2d674", + "sha256:b54e28f553ea2c382fcb18a9ae472d7d2caf4f282fabb633d94e584b7892e6b2" + ], + "index": "pypi", + "version": "==2.2.1" + }, + "virtualenv": { + "hashes": [ + "sha256:94a6898293d07f84a98add34c4df900f8ec64a570292279f6d91c781d37fd305", + "sha256:f6fc312c031f2d2344f885de114f1cb029dfcffd26aa6e57d2ee2296935c4e7d" + ], + "version": "==16.7.4" + }, + "wrapt": { + "hashes": [ + "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" + ], + "version": "==1.11.2" + } + } } diff --git a/requirements/base.txt b/requirements/base.txt index 4bef70383e..d9ebf239a2 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,7 +13,6 @@ cookiecutter==1.6.0 dateparser==0.7.1 docker==4.0.2 docutils==0.15.2 -enum34==1.1.6 flask==1.0.4 future==0.17.1 idna==2.8 diff --git a/requirements/dev.txt b/requirements/dev.txt index edead4ceff..7c0a04d372 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,18 +1,21 @@ +astroid==2.0.3 coverage==4.3.4 flake8==3.3.0 -tox==2.2.1 -pytest-cov==2.4.0 -# astroid > 2.0.4 is not compatible with pylint1.7 -astroid>=1.5.8,<2.1.0 -pylint==1.7.2 - -# Test requirements -pytest==3.1.0 -py==1.4.33 +sort==4.3.21 +lazy-object-proxy==1.4.2 +mccabe==0.6.1 mock==2.0.0 parameterized==0.6.1 -pathlib2==2.3.2; python_version<"3.4" -futures==3.2.0; python_version<"3.2.3" -# Py3.2 backport -backports.tempfile==1.0 -pytest-xdist==1.20.0 \ No newline at end of file +pbr==5.4.2 +pluggy==0.3.1 +py==1.4.33 +pycodestyle==2.3.1 +pyflakes==1.5.0 +pylint==1.7.2 +pytest-cov==2.4.0 +pytest==3.1.0 +pytest-xdist==1.20.0 +six==1.11.0 +tox==2.2.1 +virtualenv==16.7.4 +wrapt==1.11.2 From d46eb8e8f0903144d9c7f9b45ac86ff1fd522fd3 Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Fri, 23 Aug 2019 15:15:04 -0700 Subject: [PATCH 3/4] fix: generate new Pipfile.lock - python 3.7 specific --- Pipfile | 5 +++-- Pipfile.lock | 46 ++++++++++++++++++++++++++++++------------- requirements/base.txt | 2 +- requirements/dev.txt | 7 +++++-- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/Pipfile b/Pipfile index 97cb5bfd28..ac8b9789b9 100644 --- a/Pipfile +++ b/Pipfile @@ -13,10 +13,12 @@ astroid = "==2.0.3" pylint = "==1.7.2" # Test requirements -pytest = "==3.0.7" +pytest = "==3.1.0" +pytest-xdist= "==1.20.0" py = "==1.4.33" mock = "==2.0.0" parameterized= "==0.6.1" +# non-python3.7 dependencies # pathlib2==2.3.2; python_version<"3.4" # futures==3.2.0; python_version<"3.2.3" # Py3.2 backport @@ -27,7 +29,6 @@ parameterized= "==0.6.1" six = "==1.11.0" chevron = "==0.13.1" click = "==7.0" -enum34 = "==1.1.6" boto3 = "==1.9.213" cookiecutter = "==1.6.0" aws-sam-translator = "==1.13.1" diff --git a/Pipfile.lock b/Pipfile.lock index 0f5ae8a20e..42ef245348 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "634ec977c08ca082c137711c0ee434f60131901b9432af96e1d91d01383af1bf" + "sha256": "83ee986a868b9f7d5e3f279571aa80a01fa83f9c287370f9a64df5e5bb1067ec" }, "pipfile-spec": 6, "requires": { @@ -141,16 +141,6 @@ "index": "pypi", "version": "==0.15.2" }, - "enum34": { - "hashes": [ - "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", - "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", - "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", - "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" - ], - "index": "pypi", - "version": "==1.1.6" - }, "flask": { "hashes": [ "sha256:1a21ccca71cee5e55b6a367cc48c6eb47e3c447f76e64d41f3f3f931c17e7c96", @@ -404,6 +394,13 @@ } }, "develop": { + "apipkg": { + "hashes": [ + "sha256:37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6", + "sha256:58587dd4dc3daefad0487f6d9ae32b4542b185e1c36db6993290e7c41ca2b47c" + ], + "version": "==1.5" + }, "astroid": { "hashes": [ "sha256:57152b96d17e8e2026255987a43b4d860bc23814fb1709ae9b25cdad37c45a02", @@ -452,6 +449,13 @@ "index": "pypi", "version": "==4.3.4" }, + "execnet": { + "hashes": [ + "sha256:0dd40ad3b960aae93bdad7fe1c3f049bbcc8fba47094655a4301f5b33e906816", + "sha256:3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2" + ], + "version": "==1.7.0" + }, "flake8": { "hashes": [ "sha256:83905eadba99f73fbfe966598aaf1682b3eb6755d2263c5b33a4e8367d60b0d1", @@ -559,11 +563,11 @@ }, "pytest": { "hashes": [ - "sha256:66f332ae62593b874a648b10a8cb106bfdacd2c6288ed7dec3713c3a808a6017", - "sha256:b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab" + "sha256:239c71f1804b57b07806f315752b42f675ddf3109a11ebe8d40eef043db12a83", + "sha256:ac9378a549dd491fd7e468a1310983b7b7dee4894621384cfc9e101b148f4e11" ], "index": "pypi", - "version": "==3.0.7" + "version": "==3.1.0" }, "pytest-cov": { "hashes": [ @@ -573,6 +577,20 @@ "index": "pypi", "version": "==2.4.0" }, + "pytest-forked": { + "hashes": [ + "sha256:5fe33fbd07d7b1302c95310803a5e5726a4ff7f19d5a542b7ce57c76fed8135f", + "sha256:d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38" + ], + "version": "==1.0.2" + }, + "pytest-xdist": { + "hashes": [ + "sha256:7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe" + ], + "index": "pypi", + "version": "==1.20.0" + }, "six": { "hashes": [ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", diff --git a/requirements/base.txt b/requirements/base.txt index d9ebf239a2..bf5e8b2e24 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -34,7 +34,7 @@ s3transfer==0.2.1 serverlessrepo==0.1.9 six==1.11.0 tzlocal==2.0.0 -urllib3==1.25.3 ; python_version >= '3.4' +urllib3==1.25.3 websocket-client==0.56.0 werkzeug==0.15.5 wheel==0.33.6 diff --git a/requirements/dev.txt b/requirements/dev.txt index 7c0a04d372..fdf7d08326 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,7 +1,9 @@ +apipkg==1.5 astroid==2.0.3 coverage==4.3.4 +execnet==1.7.0 flake8==3.3.0 -sort==4.3.21 +isort==4.3.21 lazy-object-proxy==1.4.2 mccabe==0.6.1 mock==2.0.0 @@ -13,8 +15,9 @@ pycodestyle==2.3.1 pyflakes==1.5.0 pylint==1.7.2 pytest-cov==2.4.0 -pytest==3.1.0 +pytest-forked==1.0.2 pytest-xdist==1.20.0 +pytest==3.1.0 six==1.11.0 tox==2.2.1 virtualenv==16.7.4 From 372a4701636fcd8481face9f8baeb85c5be33634 Mon Sep 17 00:00:00 2001 From: Sriram Madapusi Vasudevan Date: Fri, 23 Aug 2019 16:35:35 -0700 Subject: [PATCH 4/4] fix: tests that depends on backport.tempfiles --- Pipfile | 2 +- tests/integration/init/test_init_command.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index ac8b9789b9..156e8c692b 100644 --- a/Pipfile +++ b/Pipfile @@ -22,7 +22,7 @@ parameterized= "==0.6.1" # pathlib2==2.3.2; python_version<"3.4" # futures==3.2.0; python_version<"3.2.3" # Py3.2 backport -# backports.tempfile==1.0 +# backports.tempfile = "==1.0" [packages] diff --git a/tests/integration/init/test_init_command.py b/tests/integration/init/test_init_command.py index f657ee53d7..22acec92b0 100644 --- a/tests/integration/init/test_init_command.py +++ b/tests/integration/init/test_init_command.py @@ -2,7 +2,10 @@ from subprocess import Popen import os -from backports import tempfile +try: + from backports import tempfile +except ImportError: + import tempfile class TestBasicInitCommand(TestCase):