From 9a40f8f551888eb568a87c15de1fe5ecad15cde9 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 13:36:48 +0100 Subject: [PATCH 01/10] Remove requirements.txt, to generate with pipcompile --- dev-requirements.txt | 193 ------------------------------------------- requirements.txt | 57 ------------- 2 files changed, 250 deletions(-) delete mode 100644 dev-requirements.txt delete mode 100644 requirements.txt diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 0e405fed..00000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,193 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile --generate-hashes dev-requirements.in -# -appdirs==1.4.3 \ - --hash=sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 \ - --hash=sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e \ - # via black -astroid==2.3.3 \ - --hash=sha256:71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a \ - --hash=sha256:840947ebfa8b58f318d42301cf8c0a20fd794a33b61cc4638e28e9e61ba32f42 \ - # via pylint -attrs==19.3.0 \ - --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \ - --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72 \ - # via black -bandit==1.6.2 \ - --hash=sha256:336620e220cf2d3115877685e264477ff9d9abaeb0afe3dc7264f55fa17a3952 \ - --hash=sha256:41e75315853507aa145d62a78a2a6c5e3240fe14ee7c601459d0df9418196065 -black==19.10b0 \ - --hash=sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b \ - --hash=sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539 -click==7.0 \ - --hash=sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13 \ - --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7 \ - # via black, pip-tools -colorama==0.4.3 \ - --hash=sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff \ - --hash=sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1 \ - # via radon -entrypoints==0.3 \ - --hash=sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19 \ - --hash=sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 \ - # via flake8 -flake8-polyfill==1.0.2 \ - --hash=sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9 \ - --hash=sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda \ - # via radon -flake8==3.7.9 \ - --hash=sha256:45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb \ - --hash=sha256:49356e766643ad15072a789a20915d3c91dc89fd313ccd71802303fd67e4deca \ - # via flake8-polyfill -future==0.18.2 \ - --hash=sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d \ - # via radon -gitdb2==2.0.6 \ - --hash=sha256:1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350 \ - --hash=sha256:96bbb507d765a7f51eb802554a9cfe194a174582f772e0d89f4e87288c288b7b \ - # via gitpython -gitpython==3.0.5 \ - --hash=sha256:9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42 \ - --hash=sha256:c155c6a2653593ccb300462f6ef533583a913e17857cfef8fc617c246b6dc245 \ - # via bandit -isort==4.3.21 \ - --hash=sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1 \ - --hash=sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd \ - # via pylint -lazy-object-proxy==1.4.3 \ - --hash=sha256:0c4b206227a8097f05c4dbdd323c50edf81f15db3b8dc064d08c62d37e1a504d \ - --hash=sha256:194d092e6f246b906e8f70884e620e459fc54db3259e60cf69a4d66c3fda3449 \ - --hash=sha256:1be7e4c9f96948003609aa6c974ae59830a6baecc5376c25c92d7d697e684c08 \ - --hash=sha256:4677f594e474c91da97f489fea5b7daa17b5517190899cf213697e48d3902f5a \ - --hash=sha256:48dab84ebd4831077b150572aec802f303117c8cc5c871e182447281ebf3ac50 \ - --hash=sha256:5541cada25cd173702dbd99f8e22434105456314462326f06dba3e180f203dfd \ - --hash=sha256:59f79fef100b09564bc2df42ea2d8d21a64fdcda64979c0fa3db7bdaabaf6239 \ - --hash=sha256:8d859b89baf8ef7f8bc6b00aa20316483d67f0b1cbf422f5b4dc56701c8f2ffb \ - --hash=sha256:9254f4358b9b541e3441b007a0ea0764b9d056afdeafc1a5569eee1cc6c1b9ea \ - --hash=sha256:9651375199045a358eb6741df3e02a651e0330be090b3bc79f6d0de31a80ec3e \ - --hash=sha256:97bb5884f6f1cdce0099f86b907aa41c970c3c672ac8b9c8352789e103cf3156 \ - --hash=sha256:9b15f3f4c0f35727d3a0fba4b770b3c4ebbb1fa907dbcc046a1d2799f3edd142 \ - --hash=sha256:a2238e9d1bb71a56cd710611a1614d1194dc10a175c1e08d75e1a7bcc250d442 \ - --hash=sha256:a6ae12d08c0bf9909ce12385803a543bfe99b95fe01e752536a60af2b7797c62 \ - --hash=sha256:ca0a928a3ddbc5725be2dd1cf895ec0a254798915fb3a36af0964a0a4149e3db \ - --hash=sha256:cb2c7c57005a6804ab66f106ceb8482da55f5314b7fcb06551db1edae4ad1531 \ - --hash=sha256:d74bb8693bf9cf75ac3b47a54d716bbb1a92648d5f781fc799347cfc95952383 \ - --hash=sha256:d945239a5639b3ff35b70a88c5f2f491913eb94871780ebfabb2568bd58afc5a \ - --hash=sha256:eba7011090323c1dadf18b3b689845fd96a61ba0a1dfbd7f24b921398affc357 \ - --hash=sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4 \ - --hash=sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0 \ - # via astroid -mando==0.6.4 \ - --hash=sha256:4ce09faec7e5192ffc3c57830e26acba0fd6cd11e1ee81af0d4df0657463bd1c \ - --hash=sha256:79feb19dc0f097daa64a1243db578e7674909b75f88ac2220f1c065c10a0d960 \ - # via radon -mccabe==0.6.1 \ - --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \ - --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f \ - # via flake8, pylint -pathspec==0.7.0 \ - --hash=sha256:163b0632d4e31cef212976cf57b43d9fd6b0bac6e67c26015d611a647d5e7424 \ - --hash=sha256:562aa70af2e0d434367d9790ad37aed893de47f1693e4201fd1d3dca15d19b96 \ - # via black -pbr==5.4.4 \ - --hash=sha256:139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b \ - --hash=sha256:61aa52a0f18b71c5cc58232d2cf8f8d09cd67fcad60b742a60124cb8d6951488 \ - # via stevedore -pip-tools==4.3.0 \ - --hash=sha256:06efa50b7089b2abbfcf4b47684960538af74669e801e69a557cb8a1c6ad6674 \ - --hash=sha256:79e8137a2b96906ccaed0151e1df42daf386d51abb80286173d112b5296a5775 -pycodestyle==2.5.0 \ - --hash=sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56 \ - --hash=sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c \ - # via flake8 -pyflakes==2.1.1 \ - --hash=sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0 \ - --hash=sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2 \ - # via flake8 -pylint==2.4.4 \ - --hash=sha256:3db5468ad013380e987410a8d6956226963aed94ecb5f9d3a28acca6d9ac36cd \ - --hash=sha256:886e6afc935ea2590b462664b161ca9a5e40168ea99e5300935f6591ad467df4 -pyyaml==5.3 \ - --hash=sha256:059b2ee3194d718896c0ad077dd8c043e5e909d9180f387ce42012662a4946d6 \ - --hash=sha256:1cf708e2ac57f3aabc87405f04b86354f66799c8e62c28c5fc5f88b5521b2dbf \ - --hash=sha256:24521fa2890642614558b492b473bee0ac1f8057a7263156b02e8b14c88ce6f5 \ - --hash=sha256:4fee71aa5bc6ed9d5f116327c04273e25ae31a3020386916905767ec4fc5317e \ - --hash=sha256:70024e02197337533eef7b85b068212420f950319cc8c580261963aefc75f811 \ - --hash=sha256:74782fbd4d4f87ff04159e986886931456a1894c61229be9eaf4de6f6e44b99e \ - --hash=sha256:940532b111b1952befd7db542c370887a8611660d2b9becff75d39355303d82d \ - --hash=sha256:cb1f2f5e426dc9f07a7681419fe39cee823bb74f723f36f70399123f439e9b20 \ - --hash=sha256:dbbb2379c19ed6042e8f11f2a2c66d39cceb8aeace421bfc29d085d93eda3689 \ - --hash=sha256:e3a057b7a64f1222b56e47bcff5e4b94c4f61faac04c7c4ecb1985e18caa3994 \ - --hash=sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615 \ - # via bandit -radon==4.0.0 \ - --hash=sha256:20f799949e42e6899bc9304539de222d3bdaeec276f38fbd4034859ccd548b46 \ - --hash=sha256:32ac2f86bfacbddade5c79f0e927e97f90a5cda5b86f880511dd849c4a0096e3 -regex==2020.1.8 \ - --hash=sha256:07b39bf943d3d2fe63d46281d8504f8df0ff3fe4c57e13d1656737950e53e525 \ - --hash=sha256:0932941cdfb3afcbc26cc3bcf7c3f3d73d5a9b9c56955d432dbf8bbc147d4c5b \ - --hash=sha256:0e182d2f097ea8549a249040922fa2b92ae28be4be4895933e369a525ba36576 \ - --hash=sha256:10671601ee06cf4dc1bc0b4805309040bb34c9af423c12c379c83d7895622bb5 \ - --hash=sha256:23e2c2c0ff50f44877f64780b815b8fd2e003cda9ce817a7fd00dea5600c84a0 \ - --hash=sha256:26ff99c980f53b3191d8931b199b29d6787c059f2e029b2b0c694343b1708c35 \ - --hash=sha256:27429b8d74ba683484a06b260b7bb00f312e7c757792628ea251afdbf1434003 \ - --hash=sha256:3e77409b678b21a056415da3a56abfd7c3ad03da71f3051bbcdb68cf44d3c34d \ - --hash=sha256:4e8f02d3d72ca94efc8396f8036c0d3bcc812aefc28ec70f35bb888c74a25161 \ - --hash=sha256:4eae742636aec40cf7ab98171ab9400393360b97e8f9da67b1867a9ee0889b26 \ - --hash=sha256:6a6ae17bf8f2d82d1e8858a47757ce389b880083c4ff2498dba17c56e6c103b9 \ - --hash=sha256:6a6ba91b94427cd49cd27764679024b14a96874e0dc638ae6bdd4b1a3ce97be1 \ - --hash=sha256:7bcd322935377abcc79bfe5b63c44abd0b29387f267791d566bbb566edfdd146 \ - --hash=sha256:98b8ed7bb2155e2cbb8b76f627b2fd12cf4b22ab6e14873e8641f266e0fb6d8f \ - --hash=sha256:bd25bb7980917e4e70ccccd7e3b5740614f1c408a642c245019cff9d7d1b6149 \ - --hash=sha256:d0f424328f9822b0323b3b6f2e4b9c90960b24743d220763c7f07071e0778351 \ - --hash=sha256:d58e4606da2a41659c84baeb3cfa2e4c87a74cec89a1e7c56bee4b956f9d7461 \ - --hash=sha256:e3cd21cc2840ca67de0bbe4071f79f031c81418deb544ceda93ad75ca1ee9f7b \ - --hash=sha256:e6c02171d62ed6972ca8631f6f34fa3281d51db8b326ee397b9c83093a6b7242 \ - --hash=sha256:e7c7661f7276507bce416eaae22040fd91ca471b5b33c13f8ff21137ed6f248c \ - --hash=sha256:ecc6de77df3ef68fee966bb8cb4e067e84d4d1f397d0ef6fce46913663540d77 \ - # via black -six==1.14.0 \ - --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a \ - --hash=sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c \ - # via astroid, bandit, mando, pip-tools, stevedore -smmap2==2.0.5 \ - --hash=sha256:0555a7bf4df71d1ef4218e4807bbf9b201f910174e6e08af2e138d4e517b4dde \ - --hash=sha256:29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a \ - # via gitdb2 -stevedore==1.31.0 \ - --hash=sha256:01d9f4beecf0fbd070ddb18e5efb10567801ba7ef3ddab0074f54e3cd4e91730 \ - --hash=sha256:e0739f9739a681c7a1fda76a102b65295e96a144ccdb552f2ae03c5f0abe8a14 \ - # via bandit -toml==0.10.0 \ - --hash=sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c \ - --hash=sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e \ - # via black -typed-ast==1.4.1 \ - --hash=sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355 \ - --hash=sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919 \ - --hash=sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa \ - --hash=sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652 \ - --hash=sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75 \ - --hash=sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01 \ - --hash=sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d \ - --hash=sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1 \ - --hash=sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907 \ - --hash=sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c \ - --hash=sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3 \ - --hash=sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b \ - --hash=sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614 \ - --hash=sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb \ - --hash=sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b \ - --hash=sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41 \ - --hash=sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6 \ - --hash=sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34 \ - --hash=sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe \ - --hash=sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4 \ - --hash=sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7 \ - # via astroid, black -wrapt==1.11.2 \ - --hash=sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1 \ - # via astroid diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index f056107e..00000000 --- a/requirements.txt +++ /dev/null @@ -1,57 +0,0 @@ -# -# This file is autogenerated by pip-compile -# To update, run: -# -# pip-compile --generate-hashes requirements.in -# -click==7.0 \ - --hash=sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13 \ - --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7 \ - # via flask -flask==1.1.1 \ - --hash=sha256:13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52 \ - --hash=sha256:45eb5a6fd193d6cf7e0cf5d8a5b31f83d5faae0293695626f539a823e93b13f6 -itsdangerous==1.1.0 \ - --hash=sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 \ - --hash=sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749 \ - # via flask -jinja2==2.10.3 \ - --hash=sha256:74320bb91f31270f9551d46522e33af46a80c3d619f4a4bf42b3164d30b5911f \ - --hash=sha256:9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de \ - # via flask -markupsafe==1.1.1 \ - --hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \ - --hash=sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161 \ - --hash=sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235 \ - --hash=sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5 \ - --hash=sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff \ - --hash=sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b \ - --hash=sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1 \ - --hash=sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e \ - --hash=sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183 \ - --hash=sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66 \ - --hash=sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1 \ - --hash=sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1 \ - --hash=sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e \ - --hash=sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b \ - --hash=sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905 \ - --hash=sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735 \ - --hash=sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d \ - --hash=sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e \ - --hash=sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d \ - --hash=sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c \ - --hash=sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21 \ - --hash=sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2 \ - --hash=sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5 \ - --hash=sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b \ - --hash=sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6 \ - --hash=sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f \ - --hash=sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f \ - --hash=sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7 \ - # via jinja2 -sqlalchemy==1.3.12 \ - --hash=sha256:bfb8f464a5000b567ac1d350b9090cf081180ec1ab4aa87e7bca12dab25320ec -werkzeug==0.16.0 \ - --hash=sha256:7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7 \ - --hash=sha256:e5f4a1f98b52b18a93da705a7458e55afb26f32bff83ff5d19189f92462d65c4 \ - # via flask -- GitLab From 5f8ab1b818012e20cfebb23025929ed66341a818 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 15:21:39 +0100 Subject: [PATCH 02/10] Add minimal Flask app --- src/hello.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/hello.py diff --git a/src/hello.py b/src/hello.py new file mode 100644 index 00000000..536075b5 --- /dev/null +++ b/src/hello.py @@ -0,0 +1,8 @@ +from flask import Flask + +app = Flask(__name__) + + +@app.route("/") +def hello_world(): + return "Hello, World!" -- GitLab From 54f87493dbb1730de47633f5ed6dbff9bc5b1423 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 15:32:45 +0100 Subject: [PATCH 03/10] Change ci yml --- .gitlab-ci.yml | 2 +- src/hello.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9aff62ed..064f7f30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ black: stage: format script: - yum install git -y - - FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA -- "*.py") + - export FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA -- "*.py") - if [ -z "$FILES" ]; then exit 0; fi - yum install python3-pip -y - pip3 install black diff --git a/src/hello.py b/src/hello.py index 536075b5..1a4dbb1a 100644 --- a/src/hello.py +++ b/src/hello.py @@ -2,7 +2,7 @@ from flask import Flask app = Flask(__name__) - +# minimal app @app.route("/") def hello_world(): return "Hello, World!" -- GitLab From f7e35d220bcf4523e9f474deb9938e3b96593d86 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 15:39:28 +0100 Subject: [PATCH 04/10] Try to fix diff in CI --- .gitlab-ci.yml | 2 +- src/hello.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 064f7f30..96234de2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ black: stage: format script: - yum install git -y - - export FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA -- "*.py") + - FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA~1 -- "*.py") - if [ -z "$FILES" ]; then exit 0; fi - yum install python3-pip -y - pip3 install black diff --git a/src/hello.py b/src/hello.py index 1a4dbb1a..536075b5 100644 --- a/src/hello.py +++ b/src/hello.py @@ -2,7 +2,7 @@ from flask import Flask app = Flask(__name__) -# minimal app + @app.route("/") def hello_world(): return "Hello, World!" -- GitLab From 3f91ac05133f4f18f3f7883ffbb0da59c8936d11 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 15:41:45 +0100 Subject: [PATCH 05/10] first change --- src/hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hello.py b/src/hello.py index 536075b5..2b341348 100644 --- a/src/hello.py +++ b/src/hello.py @@ -2,7 +2,7 @@ from flask import Flask app = Flask(__name__) - +# double @app.route("/") def hello_world(): return "Hello, World!" -- GitLab From d0ce1bf4901527fe727f4347eb42c1d0cc3e08c3 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 15:42:10 +0100 Subject: [PATCH 06/10] second commit change --- src/hello.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hello.py b/src/hello.py index 2b341348..c7801669 100644 --- a/src/hello.py +++ b/src/hello.py @@ -2,7 +2,7 @@ from flask import Flask app = Flask(__name__) -# double +# double commit change @app.route("/") def hello_world(): return "Hello, World!" -- GitLab From af6aec7f7f53ddc7e2938354a2d57312533111c8 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 16:38:45 +0100 Subject: [PATCH 07/10] Make CI run on all files --- .gitlab-ci.yml | 35 ++++++++++++++-------------- .gitlab-ci/radon.sh | 57 +++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 51 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96234de2..7a772b2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,10 @@ - +# The jobs run for every file in src/, even if they haven't been changed. +# Unfortunately Gitlab CI doesn't have any way to know the commit before the push. +# I used to do this to select only the files that had been changed: +# FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA~1 -- "*.py") +# if [ -z "$FILES" ]; then exit 0; fi +# The problem was that a push with multiple commits might pass the last commit even +# if the previous failed. image: docker.io/library/centos:7 stages: @@ -7,60 +13,53 @@ stages: - schedule black: - # Check that every changed file has been formatted with black + # Check that every file has been formatted with black stage: format script: - yum install git -y - - FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA~1 -- "*.py") - - if [ -z "$FILES" ]; then exit 0; fi - yum install python3-pip -y - pip3 install black - - for file in $FILES; do black --check --fast --target-version py36 $file; done + - black --check --fast --target-version py36 src/ pylint: - # Check that every changed file doesn't have syntax errors + # Check that every file doesn't have syntax errors stage: static_code_analysis script: - yum install git -y - - FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA -- "*.py") - - if [ -z "$FILES" ]; then exit 0; fi - yum install python3-pip -y - pip3 install pylint - - for file in $FILES; do pylint --output-format colorized --disable C,R,W $file; done + - pylint --output-format colorized --disable C,R,W src/ radon: - # Check that every changed file doesn't have syntax errors + # Check metrics for every file stage: static_code_analysis script: - yum install git -y - - export FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA -- "*.py") - - if [ -z "$FILES" ]; then exit 0; fi - yum install python3-pip -y - pip3 install radon - source .gitlab-ci/radon.sh bandit: - # Find potential security issues in every changed file. + # Find potential security issues in file. # It's allowed to fail as it may detect false positives. allow_failure: true stage: static_code_analysis script: - yum install git -y - - export FILES=$(git diff --name-only --diff-filter=ACMR $CI_COMMIT_SHA -- "*.py") - - if [ -z "$FILES" ]; then exit 0; fi - yum install python3-pip -y - pip3 install bandit - - for file in $FILES; do bandit $file; done + - bandit -r src/ bandit_schedule: - # Find potential security issues in every python file. + # Find potential security issues in file. # It's allowed to fail as it may detect false positives. allow_failure: true stage: schedule only: - schedules + stage: static_code_analysis script: - yum install git -y - yum install python3-pip -y - pip3 install bandit - - bandit . -r \ No newline at end of file + - bandit -r src/ \ No newline at end of file diff --git a/.gitlab-ci/radon.sh b/.gitlab-ci/radon.sh index ce0cca1c..6db69d28 100644 --- a/.gitlab-ci/radon.sh +++ b/.gitlab-ci/radon.sh @@ -21,37 +21,28 @@ WARN () { echo -e "${YELLOW}$1${NC}"; } +radon_output="$(radon cc --min E --show-complexity /src)" +if [ $exit_code -ne 0 ] +then + FAIL "radon exited with an error" + exit 1 +fi +if [[ "${radon_output// }" ]] # ignore whitespace (the last //) +then + echo -e "$radon_output" + FAIL "radon detected files with a very high Cyclomatic Complexity" + exit 1 +fi -for file in $FILES -do - radon_output="$(radon cc --min E --show-complexity $file)" - if [ $exit_code -ne 0 ] - then - FAIL "radon exited with an error" - exit 1 - fi - if [[ "${radon_output// }" ]] # ignore whitespace (the last //) - then - echo -e "$radon_output" - FAIL "radon detected files with a very high Cyclomatic Complexity" - exit 1 - fi -done - -INFO "Running radon (checking Maintainability Index)" -for file in $FILES -do - radon_output="$(radon mi --min B $file)" - if [ $exit_code -ne 0 ] - then - FAIL "radon exited with an error" - exit 1 - fi - if [[ "${radon_output// }" ]] - then - echo -e "$radon_output" - FAIL "radon detected files with a very low Maintainability Index" - exit 1 - fi -done -} \ No newline at end of file +radon_output="$(radon mi --min B /src)" +if [ $exit_code -ne 0 ] +then + FAIL "radon exited with an error" + exit 1 +fi +if [[ "${radon_output// }" ]] +then + echo -e "$radon_output" + FAIL "radon detected files with a very low Maintainability Index" + exit 1 +fi -- GitLab From adce1c5cb36278bd958c7edfa4449783c81ef6e5 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 16:50:01 +0100 Subject: [PATCH 08/10] Fix pylint CI --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a772b2c..e6db4311 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,11 @@ pylint: script: - yum install git -y - yum install python3-pip -y - - pip3 install pylint + - pip3 install pylint pip-tools + - python3 -m venv venv + - source venv/bin/activate + - source pipcompile.sh + - source pipsyncdev.sh - pylint --output-format colorized --disable C,R,W src/ radon: -- GitLab From 0e49ab311ab31305c9d18e11ea991e617a1db40c Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 16:55:33 +0100 Subject: [PATCH 09/10] Fix pylint CI --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6db4311..69d2934d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,13 +8,12 @@ image: docker.io/library/centos:7 stages: - - format - static_code_analysis - schedule black: # Check that every file has been formatted with black - stage: format + stage: static_code_analysis script: - yum install git -y - yum install python3-pip -y @@ -27,9 +26,9 @@ pylint: script: - yum install git -y - yum install python3-pip -y - - pip3 install pylint pip-tools - python3 -m venv venv - source venv/bin/activate + - pip3 install pylint pip-tools - source pipcompile.sh - source pipsyncdev.sh - pylint --output-format colorized --disable C,R,W src/ -- GitLab From be14ffb31a846b16b48e00077e931be0e948e647 Mon Sep 17 00:00:00 2001 From: Carles Garcia Cabot <carles.garcia.cabot@cern.ch> Date: Wed, 22 Jan 2020 17:00:47 +0100 Subject: [PATCH 10/10] Try to fix CI --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69d2934d..46f97b50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,8 @@ pylint: # Check that every file doesn't have syntax errors stage: static_code_analysis script: + - export LC_ALL=en_US.utf-8 + - export LANG=en_US.utf-8 - yum install git -y - yum install python3-pip -y - python3 -m venv venv -- GitLab