From c356efd04530569d67d78672561429a1c6313658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 07:56:55 +0000 Subject: [PATCH 01/47] Bump werkzeug from 0.14.1 to 0.15.3 Bumps [werkzeug](https://github.com/pallets/werkzeug) from 0.14.1 to 0.15.3. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/master/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/0.14.1...0.15.3) Signed-off-by: dependabot[bot] --- Pipfile.lock | 315 +++++++++++++++++++++++++-------------------------- 1 file changed, 154 insertions(+), 161 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 1350c96..1ce429a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d718acf10c644a164aa41698100acbfd104741e6c6988e45eb5b40037c4c1798" + "sha256": "52a3659acae73e9e3dbdd8010a0cb2ce1f80344c5d8fcfb3c2bc99d8ca30591c" }, "pipfile-spec": 6, "requires": { @@ -18,93 +18,68 @@ "default": { "alembic": { "hashes": [ - "sha256:52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e", - "sha256:eb7db9b4510562ec37c91d00b00d95fde076c1030d3f661aea882eec532b3565" + "sha256:4e02ed2aa796bd179965041afa092c55b51fb077de19d61835673cc80672c01c", + "sha256:5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245" ], - "version": "==1.0.0" + "version": "==1.4.3" }, "apispec": { "hashes": [ - "sha256:1661bc574b1579ef72883aafd87c0178d1c129659cd4f1c76a68fcc852e1b4ed", - "sha256:3ad66b1aa0a330db71ab424ca17b946d80ef5923d28da5ccdad692a7937efb9e" + "sha256:20d271f7c8d130719be223fdb122af391ff8d59fb24958c793f632305b87f8ed", + "sha256:360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a" ], - "version": "==0.39.0" + "version": "==4.0.0" }, "bcrypt": { "hashes": [ - "sha256:01477981abf74e306e8ee31629a940a5e9138de000c6b0898f7f850461c4a0a5", - "sha256:054d6e0acaea429e6da3613fcd12d05ee29a531794d96f6ab959f29a39f33391", - "sha256:0872eeecdf9a429c1420158500eedb323a132bc5bf3339475151c52414729e70", - "sha256:09a3b8c258b815eadb611bad04ca15ec77d86aa9ce56070e1af0d5932f17642a", - "sha256:0f317e4ffbdd15c3c0f8ab5fbd86aa9aabc7bea18b5cc5951b456fe39e9f738c", - "sha256:2788c32673a2ad0062bea850ab73cffc0dba874db10d7a3682b6f2f280553f20", - "sha256:321d4d48be25b8d77594d8324c0585c80ae91ac214f62db9098734e5e7fb280f", - "sha256:346d6f84ff0b493dbc90c6b77136df83e81f903f0b95525ee80e5e6d5e4eef84", - "sha256:34dd60b90b0f6de94a89e71fcd19913a30e83091c8468d0923a93a0cccbfbbff", - "sha256:3b4c23300c4eded8895442c003ae9b14328ae69309ac5867e7530de8bdd7875d", - "sha256:43d1960e7db14042319c46925892d5fa99b08ff21d57482e6f5328a1aca03588", - "sha256:49e96267cd9be55a349fd74f9852eb9ae2c427cd7f6455d0f1765d7332292832", - "sha256:63e06ffdaf4054a89757a3a1ab07f1b922daf911743114a54f7c561b9e1baa58", - "sha256:67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d", - "sha256:6b662a5669186439f4f583636c8d6ea77cf92f7cfe6aae8d22edf16c36840574", - "sha256:6efd9ca20aefbaf2e7e6817a2c6ed4a50ff6900fafdea1bcb1d0e9471743b144", - "sha256:8569844a5d8e1fdde4d7712a05ab2e6061343ac34af6e7e3d7935b2bd1907bfd", - "sha256:8629ea6a8a59f865add1d6a87464c3c676e60101b8d16ef404d0a031424a8491", - "sha256:988cac675e25133d01a78f2286189c1f01974470817a33eaf4cfee573cfb72a5", - "sha256:9a6fedda73aba1568962f7543a1f586051c54febbc74e87769bad6a4b8587c39", - "sha256:9eced8962ce3b7124fe20fd358cf8c7470706437fa064b9874f849ad4c5866fc", - "sha256:a005ed6163490988711ff732386b08effcbf8df62ae93dd1e5bda0714fad8afb", - "sha256:ae35dbcb6b011af6c840893b32399252d81ff57d52c13e12422e16b5fea1d0fb", - "sha256:b1e8491c6740f21b37cca77bc64677696a3fb9f32360794d57fa8477b7329eda", - "sha256:c906bdb482162e9ef48eea9f8c0d967acceb5c84f2d25574c7d2a58d04861df1", - "sha256:cb18ffdc861dbb244f14be32c47ab69604d0aca415bee53485fcea4f8e93d5ef", - "sha256:cc2f24dc1c6c88c56248e93f28d439ee4018338567b0bbb490ea26a381a29b1e", - "sha256:d860c7fff18d49e20339fc6dffc2d485635e36d4b2cccf58f45db815b64100b4", - "sha256:d86da365dda59010ba0d1ac45aa78390f56bf7f992e65f70b3b081d5e5257b09", - "sha256:e22f0997622e1ceec834fd25947dc2ee2962c2133ea693d61805bc867abaf7ea", - "sha256:f2fe545d27a619a552396533cddf70d83cecd880a611cdfdbb87ca6aec52f66b", - "sha256:f425e925485b3be48051f913dbe17e08e8c48588fdf44a26b8b14067041c0da6", - "sha256:f7fd3ed3745fe6e81e28dc3b3d76cce31525a91f32a387e1febd6b982caf8cdb", - "sha256:f9210820ee4818d84658ed7df16a7f30c9fba7d8b139959950acef91745cc0f7" - ], - "version": "==3.1.4" + "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29", + "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7", + "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34", + "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55", + "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6", + "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1", + "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d" + ], + "version": "==3.2.0" }, "cffi": { "hashes": [ - "sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743", - "sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef", - "sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50", - "sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f", - "sha256:3bb6bd7266598f318063e584378b8e27c67de998a43362e8fce664c54ee52d30", - "sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93", - "sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257", - "sha256:495c5c2d43bf6cebe0178eb3e88f9c4aa48d8934aa6e3cddb865c058da76756b", - "sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3", - "sha256:57b2533356cb2d8fac1555815929f7f5f14d68ac77b085d2326b571310f34f6e", - "sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc", - "sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04", - "sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6", - "sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359", - "sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596", - "sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b", - "sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd", - "sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95", - "sha256:a6a5cb8809091ec9ac03edde9304b3ad82ad4466333432b16d78ef40e0cce0d5", - "sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e", - "sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6", - "sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca", - "sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31", - "sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1", - "sha256:ca1bd81f40adc59011f58159e4aa6445fc585a32bb8ac9badf7a2c1aa23822f2", - "sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085", - "sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801", - "sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4", - "sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184", - "sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917", - "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f", - "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb" - ], - "version": "==1.11.5" + "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", + "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d", + "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a", + "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec", + "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362", + "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668", + "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c", + "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b", + "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06", + "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698", + "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2", + "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c", + "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7", + "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", + "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", + "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", + "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", + "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", + "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", + "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", + "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", + "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", + "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", + "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", + "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", + "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", + "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", + "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", + "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", + "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", + "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375", + "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b", + "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b", + "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f" + ], + "version": "==1.14.4" }, "click": { "hashes": [ @@ -186,35 +161,62 @@ }, "itsdangerous": { "hashes": [ - "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" + "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", + "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" ], - "version": "==0.24" + "version": "==1.1.0" }, "jinja2": { "hashes": [ - "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", - "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" - ], - "version": "==2.10" - }, - "jsonify": { - "hashes": [ - "sha256:f340032753577575e9777835809b283fdc9b251867d5d5600389131647f8bfe1" + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], - "index": "pypi", - "version": "==0.5" + "version": "==2.11.2" }, "mako": { "hashes": [ - "sha256:4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae" + "sha256:8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27", + "sha256:93729a258e4ff0747c876bd9e20df1b9758028946e976324ccd2d68245c7b6a9" ], - "version": "==1.0.7" + "version": "==1.1.3" }, "markupsafe": { "hashes": [ - "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" - ], - "version": "==1.0" + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", + "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:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + ], + "version": "==1.1.1" }, "marshmallow": { "hashes": [ @@ -262,9 +264,10 @@ }, "pycparser": { "hashes": [ - "sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226" + "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", + "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705" ], - "version": "==2.18" + "version": "==2.20" }, "pyjwt": { "hashes": [ @@ -276,39 +279,25 @@ }, "python-dateutil": { "hashes": [ - "sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0", - "sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8" + "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", + "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "version": "==2.7.3" + "version": "==2.8.1" }, "python-editor": { "hashes": [ - "sha256:a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565" + "sha256:1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d", + "sha256:51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b", + "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8" ], - "version": "==1.0.3" - }, - "pyyaml": { - "hashes": [ - "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b", - "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf", - "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a", - "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3", - "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1", - "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1", - "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613", - "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04", - "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f", - "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537", - "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531" - ], - "version": "==3.13" + "version": "==1.0.4" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.11.0" + "version": "==1.15.0" }, "sqlalchemy": { "hashes": [ @@ -326,49 +315,49 @@ }, "unidecode": { "hashes": [ - "sha256:72f49d3729f3d8f5799f710b97c1451c5163102e76d64d20e170aedbbd923582", - "sha256:8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5" + "sha256:1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", + "sha256:2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8" ], - "version": "==1.0.22" + "version": "==1.1.1" }, "webargs": { "hashes": [ - "sha256:7f76cea1989391480198840ef9cabb8041db7129e0a58f15e6962b92d4938a17", - "sha256:a4701fd0af6cc398005584865cd43a914e319d7a29942f757cd9dbc53e2a39ec" + "sha256:2ead6ce38559152043ab4ada4d389aef6c804b0c169482e7c92b3f498f690b2c", + "sha256:412ecadd977afdea0ed6fa5f5b65ddd13a099269e622ec537f9c74c443ce4d0b" ], - "version": "==3.0.2" + "version": "==6.1.1" }, "werkzeug": { "hashes": [ - "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c", - "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b" + "sha256:97660b282aa7e29f94f3fe378e5c7162d7ab9d601a8dbb1cbb2ffc8f0e54607d", + "sha256:cfd1281b1748288e59762c0e174d64d8bcb2b70e7c57bc4a1203c8825af24ac3" ], "index": "pypi", - "version": "==0.14.1" + "version": "==0.15.3" } }, "develop": { "atomicwrites": { "hashes": [ - "sha256:240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585", - "sha256:a24da68318b08ac9c9c45029f4a10371ab5b20e4226738e150e6e7c571630ae6" + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" ], - "version": "==1.1.5" + "version": "==1.4.0" }, "attrs": { "hashes": [ - "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265", - "sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b" + "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6", + "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700" ], - "version": "==18.1.0" + "version": "==20.3.0" }, "beautifulsoup4": { "hashes": [ - "sha256:11a9a27b7d3bddc6d86f59fb76afb70e921a25ac2d6cc55b40d072bd68435a76", - "sha256:7015e76bf32f1f574636c4288399a6de66ce08fb7b2457f628a8d70c0fbabb11", - "sha256:808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89" + "sha256:4c98143716ef1cb40bf7f39a8e3eec8f8b009509e74904ba3a7b315431577e35", + "sha256:84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25", + "sha256:fff47e031e34ec82bf17e00da8f592fe7de69aeea38be00523c04623c04fb666" ], - "version": "==4.6.0" + "version": "==4.9.3" }, "factory-boy": { "hashes": [ @@ -388,11 +377,10 @@ }, "more-itertools": { "hashes": [ - "sha256:2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8", - "sha256:6703844a52d3588f951883005efcf555e49566a48afd4db4e965d69b883980d3", - "sha256:a18d870ef2ffca2b8463c0070ad17b5978056f403fb64e3f15fe62a52db21cc0" + "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330", + "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf" ], - "version": "==4.2.0" + "version": "==8.6.0" }, "pluggy": { "hashes": [ @@ -400,16 +388,14 @@ "sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c", "sha256:e160a7fcf25762bb60efc7e171d4497ff1d8d2d75a3d0df7a21b76821ecbf5c5" ], - "markers": "python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*' and python_version >= '2.7'", "version": "==0.6.0" }, "py": { "hashes": [ - "sha256:3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7", - "sha256:e31fb2767eb657cbde86c454f02e99cb846d3cd9d61b318525140214fdc0e98e" + "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2", + "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342" ], - "markers": "python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'", - "version": "==1.5.4" + "version": "==1.9.0" }, "pytest": { "hashes": [ @@ -421,17 +407,25 @@ }, "python-dateutil": { "hashes": [ - "sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0", - "sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8" + "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", + "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "version": "==2.7.3" + "version": "==2.8.1" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.11.0" + "version": "==1.15.0" + }, + "soupsieve": { + "hashes": [ + "sha256:1634eea42ab371d3d346309b93df7870a88610f0725d47528be902a0d95ecc55", + "sha256:a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232" + ], + "markers": "python_version >= '3.0'", + "version": "==2.0.1" }, "text-unidecode": { "hashes": [ @@ -442,18 +436,17 @@ }, "waitress": { "hashes": [ - "sha256:40b0f297a7f3af61fbfbdc67e59090c70dc150a1601c39ecc9f5f1d283fb931b", - "sha256:d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9" + "sha256:1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261", + "sha256:3d633e78149eb83b60a07dfabb35579c29aac2d24bb803c18b26fb2ab1a584db" ], - "version": "==1.1.0" + "version": "==1.4.4" }, "webob": { "hashes": [ - "sha256:1fe722f2ab857685fc96edec567dc40b1875b21219b3b348e58cd8c4d5ea7df3", - "sha256:263690003a3e092ca1ec4df787f93feb0004e39d7bac9cba2c19a552c765894b" + "sha256:a3c89a8e9ba0aeb17382836cdb73c516d0ecf6630ec40ec28288f3ed459ce87b", + "sha256:aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108" ], - "markers": "python_version != '3.1.*' and python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.2.*'", - "version": "==1.8.2" + "version": "==1.8.6" }, "webtest": { "hashes": [ From 2a263641da834a49029fe86cb545492c3203e6c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 07:57:05 +0000 Subject: [PATCH 02/47] Bump sqlalchemy from 1.2.9 to 1.3.0 Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.2.9 to 1.3.0. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/master/CHANGES) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) Signed-off-by: dependabot[bot] --- Pipfile.lock | 313 +++++++++++++++++++++++++-------------------------- 1 file changed, 153 insertions(+), 160 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 1350c96..c2643a4 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d718acf10c644a164aa41698100acbfd104741e6c6988e45eb5b40037c4c1798" + "sha256": "52a3659acae73e9e3dbdd8010a0cb2ce1f80344c5d8fcfb3c2bc99d8ca30591c" }, "pipfile-spec": 6, "requires": { @@ -18,93 +18,68 @@ "default": { "alembic": { "hashes": [ - "sha256:52d73b1d750f1414fa90c25a08da47b87de1e4ad883935718a8f36396e19e78e", - "sha256:eb7db9b4510562ec37c91d00b00d95fde076c1030d3f661aea882eec532b3565" + "sha256:4e02ed2aa796bd179965041afa092c55b51fb077de19d61835673cc80672c01c", + "sha256:5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245" ], - "version": "==1.0.0" + "version": "==1.4.3" }, "apispec": { "hashes": [ - "sha256:1661bc574b1579ef72883aafd87c0178d1c129659cd4f1c76a68fcc852e1b4ed", - "sha256:3ad66b1aa0a330db71ab424ca17b946d80ef5923d28da5ccdad692a7937efb9e" + "sha256:20d271f7c8d130719be223fdb122af391ff8d59fb24958c793f632305b87f8ed", + "sha256:360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a" ], - "version": "==0.39.0" + "version": "==4.0.0" }, "bcrypt": { "hashes": [ - "sha256:01477981abf74e306e8ee31629a940a5e9138de000c6b0898f7f850461c4a0a5", - "sha256:054d6e0acaea429e6da3613fcd12d05ee29a531794d96f6ab959f29a39f33391", - "sha256:0872eeecdf9a429c1420158500eedb323a132bc5bf3339475151c52414729e70", - "sha256:09a3b8c258b815eadb611bad04ca15ec77d86aa9ce56070e1af0d5932f17642a", - "sha256:0f317e4ffbdd15c3c0f8ab5fbd86aa9aabc7bea18b5cc5951b456fe39e9f738c", - "sha256:2788c32673a2ad0062bea850ab73cffc0dba874db10d7a3682b6f2f280553f20", - "sha256:321d4d48be25b8d77594d8324c0585c80ae91ac214f62db9098734e5e7fb280f", - "sha256:346d6f84ff0b493dbc90c6b77136df83e81f903f0b95525ee80e5e6d5e4eef84", - "sha256:34dd60b90b0f6de94a89e71fcd19913a30e83091c8468d0923a93a0cccbfbbff", - "sha256:3b4c23300c4eded8895442c003ae9b14328ae69309ac5867e7530de8bdd7875d", - "sha256:43d1960e7db14042319c46925892d5fa99b08ff21d57482e6f5328a1aca03588", - "sha256:49e96267cd9be55a349fd74f9852eb9ae2c427cd7f6455d0f1765d7332292832", - "sha256:63e06ffdaf4054a89757a3a1ab07f1b922daf911743114a54f7c561b9e1baa58", - "sha256:67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d", - "sha256:6b662a5669186439f4f583636c8d6ea77cf92f7cfe6aae8d22edf16c36840574", - "sha256:6efd9ca20aefbaf2e7e6817a2c6ed4a50ff6900fafdea1bcb1d0e9471743b144", - "sha256:8569844a5d8e1fdde4d7712a05ab2e6061343ac34af6e7e3d7935b2bd1907bfd", - "sha256:8629ea6a8a59f865add1d6a87464c3c676e60101b8d16ef404d0a031424a8491", - "sha256:988cac675e25133d01a78f2286189c1f01974470817a33eaf4cfee573cfb72a5", - "sha256:9a6fedda73aba1568962f7543a1f586051c54febbc74e87769bad6a4b8587c39", - "sha256:9eced8962ce3b7124fe20fd358cf8c7470706437fa064b9874f849ad4c5866fc", - "sha256:a005ed6163490988711ff732386b08effcbf8df62ae93dd1e5bda0714fad8afb", - "sha256:ae35dbcb6b011af6c840893b32399252d81ff57d52c13e12422e16b5fea1d0fb", - "sha256:b1e8491c6740f21b37cca77bc64677696a3fb9f32360794d57fa8477b7329eda", - "sha256:c906bdb482162e9ef48eea9f8c0d967acceb5c84f2d25574c7d2a58d04861df1", - "sha256:cb18ffdc861dbb244f14be32c47ab69604d0aca415bee53485fcea4f8e93d5ef", - "sha256:cc2f24dc1c6c88c56248e93f28d439ee4018338567b0bbb490ea26a381a29b1e", - "sha256:d860c7fff18d49e20339fc6dffc2d485635e36d4b2cccf58f45db815b64100b4", - "sha256:d86da365dda59010ba0d1ac45aa78390f56bf7f992e65f70b3b081d5e5257b09", - "sha256:e22f0997622e1ceec834fd25947dc2ee2962c2133ea693d61805bc867abaf7ea", - "sha256:f2fe545d27a619a552396533cddf70d83cecd880a611cdfdbb87ca6aec52f66b", - "sha256:f425e925485b3be48051f913dbe17e08e8c48588fdf44a26b8b14067041c0da6", - "sha256:f7fd3ed3745fe6e81e28dc3b3d76cce31525a91f32a387e1febd6b982caf8cdb", - "sha256:f9210820ee4818d84658ed7df16a7f30c9fba7d8b139959950acef91745cc0f7" - ], - "version": "==3.1.4" + "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29", + "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7", + "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34", + "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55", + "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6", + "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1", + "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d" + ], + "version": "==3.2.0" }, "cffi": { "hashes": [ - "sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743", - "sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef", - "sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50", - "sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f", - "sha256:3bb6bd7266598f318063e584378b8e27c67de998a43362e8fce664c54ee52d30", - "sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93", - "sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257", - "sha256:495c5c2d43bf6cebe0178eb3e88f9c4aa48d8934aa6e3cddb865c058da76756b", - "sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3", - "sha256:57b2533356cb2d8fac1555815929f7f5f14d68ac77b085d2326b571310f34f6e", - "sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc", - "sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04", - "sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6", - "sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359", - "sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596", - "sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b", - "sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd", - "sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95", - "sha256:a6a5cb8809091ec9ac03edde9304b3ad82ad4466333432b16d78ef40e0cce0d5", - "sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e", - "sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6", - "sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca", - "sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31", - "sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1", - "sha256:ca1bd81f40adc59011f58159e4aa6445fc585a32bb8ac9badf7a2c1aa23822f2", - "sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085", - "sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801", - "sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4", - "sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184", - "sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917", - "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f", - "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb" - ], - "version": "==1.11.5" + "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", + "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d", + "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a", + "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec", + "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362", + "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668", + "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c", + "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b", + "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06", + "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698", + "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2", + "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c", + "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7", + "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", + "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", + "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", + "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", + "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", + "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", + "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", + "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", + "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", + "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", + "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", + "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", + "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", + "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", + "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", + "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", + "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", + "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375", + "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b", + "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b", + "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f" + ], + "version": "==1.14.4" }, "click": { "hashes": [ @@ -186,35 +161,62 @@ }, "itsdangerous": { "hashes": [ - "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" + "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", + "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" ], - "version": "==0.24" + "version": "==1.1.0" }, "jinja2": { "hashes": [ - "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", - "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" - ], - "version": "==2.10" - }, - "jsonify": { - "hashes": [ - "sha256:f340032753577575e9777835809b283fdc9b251867d5d5600389131647f8bfe1" + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], - "index": "pypi", - "version": "==0.5" + "version": "==2.11.2" }, "mako": { "hashes": [ - "sha256:4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae" + "sha256:8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27", + "sha256:93729a258e4ff0747c876bd9e20df1b9758028946e976324ccd2d68245c7b6a9" ], - "version": "==1.0.7" + "version": "==1.1.3" }, "markupsafe": { "hashes": [ - "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" - ], - "version": "==1.0" + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", + "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:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + ], + "version": "==1.1.1" }, "marshmallow": { "hashes": [ @@ -262,9 +264,10 @@ }, "pycparser": { "hashes": [ - "sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226" + "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", + "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705" ], - "version": "==2.18" + "version": "==2.20" }, "pyjwt": { "hashes": [ @@ -276,46 +279,32 @@ }, "python-dateutil": { "hashes": [ - "sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0", - "sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8" + "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", + "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "version": "==2.7.3" + "version": "==2.8.1" }, "python-editor": { "hashes": [ - "sha256:a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565" + "sha256:1bf6e860a8ad52a14c3ee1252d5dc25b2030618ed80c022598f00176adc8367d", + "sha256:51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b", + "sha256:5f98b069316ea1c2ed3f67e7f5df6c0d8f10b689964a4a811ff64f0106819ec8" ], - "version": "==1.0.3" - }, - "pyyaml": { - "hashes": [ - "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b", - "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf", - "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a", - "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3", - "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1", - "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1", - "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613", - "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04", - "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f", - "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537", - "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531" - ], - "version": "==3.13" + "version": "==1.0.4" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.11.0" + "version": "==1.15.0" }, "sqlalchemy": { "hashes": [ - "sha256:e21e5561a85dcdf16b8520ae4daec7401c5c24558e0ce004f9b60be75c4b6957" + "sha256:11ead7047ff3f394ed0d4b62aded6c5d970a9b718e1dc6add9f5e79442cc5b14" ], "index": "pypi", - "version": "==1.2.9" + "version": "==1.3.0" }, "unicode-slugify": { "hashes": [ @@ -326,17 +315,17 @@ }, "unidecode": { "hashes": [ - "sha256:72f49d3729f3d8f5799f710b97c1451c5163102e76d64d20e170aedbbd923582", - "sha256:8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5" + "sha256:1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", + "sha256:2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8" ], - "version": "==1.0.22" + "version": "==1.1.1" }, "webargs": { "hashes": [ - "sha256:7f76cea1989391480198840ef9cabb8041db7129e0a58f15e6962b92d4938a17", - "sha256:a4701fd0af6cc398005584865cd43a914e319d7a29942f757cd9dbc53e2a39ec" + "sha256:2ead6ce38559152043ab4ada4d389aef6c804b0c169482e7c92b3f498f690b2c", + "sha256:412ecadd977afdea0ed6fa5f5b65ddd13a099269e622ec537f9c74c443ce4d0b" ], - "version": "==3.0.2" + "version": "==6.1.1" }, "werkzeug": { "hashes": [ @@ -350,25 +339,25 @@ "develop": { "atomicwrites": { "hashes": [ - "sha256:240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585", - "sha256:a24da68318b08ac9c9c45029f4a10371ab5b20e4226738e150e6e7c571630ae6" + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" ], - "version": "==1.1.5" + "version": "==1.4.0" }, "attrs": { "hashes": [ - "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265", - "sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b" + "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6", + "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700" ], - "version": "==18.1.0" + "version": "==20.3.0" }, "beautifulsoup4": { "hashes": [ - "sha256:11a9a27b7d3bddc6d86f59fb76afb70e921a25ac2d6cc55b40d072bd68435a76", - "sha256:7015e76bf32f1f574636c4288399a6de66ce08fb7b2457f628a8d70c0fbabb11", - "sha256:808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89" + "sha256:4c98143716ef1cb40bf7f39a8e3eec8f8b009509e74904ba3a7b315431577e35", + "sha256:84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25", + "sha256:fff47e031e34ec82bf17e00da8f592fe7de69aeea38be00523c04623c04fb666" ], - "version": "==4.6.0" + "version": "==4.9.3" }, "factory-boy": { "hashes": [ @@ -388,11 +377,10 @@ }, "more-itertools": { "hashes": [ - "sha256:2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8", - "sha256:6703844a52d3588f951883005efcf555e49566a48afd4db4e965d69b883980d3", - "sha256:a18d870ef2ffca2b8463c0070ad17b5978056f403fb64e3f15fe62a52db21cc0" + "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330", + "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf" ], - "version": "==4.2.0" + "version": "==8.6.0" }, "pluggy": { "hashes": [ @@ -400,16 +388,14 @@ "sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c", "sha256:e160a7fcf25762bb60efc7e171d4497ff1d8d2d75a3d0df7a21b76821ecbf5c5" ], - "markers": "python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*' and python_version >= '2.7'", "version": "==0.6.0" }, "py": { "hashes": [ - "sha256:3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7", - "sha256:e31fb2767eb657cbde86c454f02e99cb846d3cd9d61b318525140214fdc0e98e" + "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2", + "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342" ], - "markers": "python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'", - "version": "==1.5.4" + "version": "==1.9.0" }, "pytest": { "hashes": [ @@ -421,17 +407,25 @@ }, "python-dateutil": { "hashes": [ - "sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0", - "sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8" + "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", + "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "version": "==2.7.3" + "version": "==2.8.1" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.11.0" + "version": "==1.15.0" + }, + "soupsieve": { + "hashes": [ + "sha256:1634eea42ab371d3d346309b93df7870a88610f0725d47528be902a0d95ecc55", + "sha256:a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232" + ], + "markers": "python_version >= '3.0'", + "version": "==2.0.1" }, "text-unidecode": { "hashes": [ @@ -442,18 +436,17 @@ }, "waitress": { "hashes": [ - "sha256:40b0f297a7f3af61fbfbdc67e59090c70dc150a1601c39ecc9f5f1d283fb931b", - "sha256:d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9" + "sha256:1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261", + "sha256:3d633e78149eb83b60a07dfabb35579c29aac2d24bb803c18b26fb2ab1a584db" ], - "version": "==1.1.0" + "version": "==1.4.4" }, "webob": { "hashes": [ - "sha256:1fe722f2ab857685fc96edec567dc40b1875b21219b3b348e58cd8c4d5ea7df3", - "sha256:263690003a3e092ca1ec4df787f93feb0004e39d7bac9cba2c19a552c765894b" + "sha256:a3c89a8e9ba0aeb17382836cdb73c516d0ecf6630ec40ec28288f3ed459ce87b", + "sha256:aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108" ], - "markers": "python_version != '3.1.*' and python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.2.*'", - "version": "==1.8.2" + "version": "==1.8.6" }, "webtest": { "hashes": [ From 2f6aa5725144991fb01de04223003c9c7a77791c Mon Sep 17 00:00:00 2001 From: PierreD <48512088+PierreDarcas@users.noreply.github.com> Date: Thu, 3 Dec 2020 09:38:34 +0100 Subject: [PATCH 03/47] Add .circleci/config.yml --- .circleci/config.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..12a4918 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,21 @@ +version: 2.1 + +orbs: + python: circleci/python@0.2.1 + +jobs: + build-and-test: + executor: python/default + steps: + - checkout + - python/load-cache + - python/install-deps + - python/save-cache + - run: + command: ./manage.py test + name: Test + +workflows: + main: + jobs: + - build-and-test From 989a30859cd509c1ed81bc2da37166ad0eb1494f Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 10:33:59 +0100 Subject: [PATCH 04/47] =?UTF-8?q?=F0=9F=94=A7config.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 64 ++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12a4918..6cb28bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,21 +1,45 @@ -version: 2.1 - -orbs: - python: circleci/python@0.2.1 - -jobs: - build-and-test: - executor: python/default - steps: - - checkout - - python/load-cache - - python/install-deps - - python/save-cache +version: 2 # use CircleCI 2.0 +jobs: # A basic unit of work in a run + build: # runs not using Workflows must have a `build` job as entry point + # directory where steps are run + working_directory: ~/circleci-demo-python-django + docker: # run the steps with Docker + # CircleCI Python images available at: https://hub.docker.com/r/circleci/python/ + - image: circleci/python:3.6.4 + auth: + username: $DOCKERHUB_USERNAME + password: $DOCKERHUB_PASSWORD # context / project UI env-var reference + environment: # environment variables for primary container + PIPENV_VENV_IN_PROJECT: true + DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable + # CircleCI PostgreSQL images available at: https://hub.docker.com/r/circleci/postgres/ + - image: circleci/postgres:9.6.2 + auth: + username: mydockerhub-user + password: $DOCKERHUB_PASSWORD # context / project UI env-var reference + environment: # environment variables for the Postgres container. + POSTGRES_USER: root + POSTGRES_DB: circle_test + steps: # steps that comprise the `build` job + - checkout # check out source code to working directory + - run: sudo chown -R circleci:circleci /usr/local/bin + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.6/site-packages + - restore_cache: + # Read about caching dependencies: https://circleci.com/docs/2.0/caching/ + key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: - command: ./manage.py test - name: Test - -workflows: - main: - jobs: - - build-and-test + command: | + sudo pip install pipenv + pipenv install + - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key + key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + paths: + - "venv" + - run: + command: | + pipenv run python manage.py test + - store_test_results: # Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/ + path: test-results + - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ + path: test-results + destination: tr1 \ No newline at end of file From a5584a187e1142845e300013da038f966825aa72 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 10:45:52 +0100 Subject: [PATCH 05/47] :green_heart: change postgres container --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6cb28bf..e5c095e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,9 +13,9 @@ jobs: # A basic unit of work in a run PIPENV_VENV_IN_PROJECT: true DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable # CircleCI PostgreSQL images available at: https://hub.docker.com/r/circleci/postgres/ - - image: circleci/postgres:9.6.2 + - image: circleci/postgres:9.6.9-alpine auth: - username: mydockerhub-user + username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference environment: # environment variables for the Postgres container. POSTGRES_USER: root From 58884d30197ea63c71218f9bb91339adad706518 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 10:52:46 +0100 Subject: [PATCH 06/47] =?UTF-8?q?=F0=9F=92=9A=20=20FLASK=5FAPP=3D$(pwd)/au?= =?UTF-8?q?toapp.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5c095e..4b01203 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,7 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | + export FLASK_APP=$(pwd)/autoapp.py sudo pip install pipenv pipenv install - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key From f8d34001a0edff1bd5ef3dc8fea8b8cb3130eaf3 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 10:59:36 +0100 Subject: [PATCH 07/47] =?UTF-8?q?=F0=9F=92=9A=20FLASK=5FAPP=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4b01203..dca87aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | - export FLASK_APP=$(pwd)/autoapp.py + export FLASK_APP= "./autoapp.py" sudo pip install pipenv pipenv install - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key From 86995156c02ca182e177b1428cf2a4f4a44117e7 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 11:02:05 +0100 Subject: [PATCH 08/47] =?UTF-8?q?=F0=9F=92=9A=20FLASK=5FAPP=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dca87aa..0af86eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | - export FLASK_APP= "./autoapp.py" + export FLASK_APP= ./autoapp.py sudo pip install pipenv pipenv install - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key From 7be266220ae971e316b82ebe4d524f4f3e34e0f7 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 11:06:13 +0100 Subject: [PATCH 09/47] =?UTF-8?q?=F0=9F=92=9A=20FLASK=5FAPP=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0af86eb..73840a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | - export FLASK_APP= ./autoapp.py + export FLASK_APP = autoapp.py sudo pip install pipenv pipenv install - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key From a3a7ae74ce35ec45c0fe2a2f9fbf99c2078546e6 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 11:07:20 +0100 Subject: [PATCH 10/47] =?UTF-8?q?=F0=9F=92=9A=20FLASK=5FAPP=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 73840a1..bb246d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | - export FLASK_APP = autoapp.py + export FLASK_APP=autoapp.py sudo pip install pipenv pipenv install - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key From 1485dbd6c8171bbe073dc27b1939ac94f9d199e6 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 11:11:07 +0100 Subject: [PATCH 11/47] =?UTF-8?q?=F0=9F=92=9A=20update=20python=20containe?= =?UTF-8?q?r=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb246d5..a1bda5c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: # A basic unit of work in a run working_directory: ~/circleci-demo-python-django docker: # run the steps with Docker # CircleCI Python images available at: https://hub.docker.com/r/circleci/python/ - - image: circleci/python:3.6.4 + - image: circleci/python:3.8.5 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference From c363a3da1ca9bbb81e22904e3385951279d763be Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 11:13:43 +0100 Subject: [PATCH 12/47] =?UTF-8?q?=F0=9F=92=9A=20update=20reference=20to=20?= =?UTF-8?q?python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1bda5c..fc732fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: # A basic unit of work in a run steps: # steps that comprise the `build` job - checkout # check out source code to working directory - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.6/site-packages + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages - restore_cache: # Read about caching dependencies: https://circleci.com/docs/2.0/caching/ key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} From addf2649cb26351f4b167d034b11e86744750a3a Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 3 Dec 2020 11:17:43 +0100 Subject: [PATCH 13/47] =?UTF-8?q?=F0=9F=92=9A=20update=20reference=20to=20?= =?UTF-8?q?autoapp.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc732fe..189d176 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: # A basic unit of work in a run - "venv" - run: command: | - pipenv run python manage.py test + pipenv run python autoapp.py test - store_test_results: # Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/ path: test-results - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ From dddfe3a55a787ec2b2467fb441285d1aec1d37b2 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 15:20:43 +0100 Subject: [PATCH 14/47] =?UTF-8?q?=F0=9F=94=80=20tests=20to=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 56 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 189d176..cdf22da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,10 +2,10 @@ version: 2 # use CircleCI 2.0 jobs: # A basic unit of work in a run build: # runs not using Workflows must have a `build` job as entry point # directory where steps are run - working_directory: ~/circleci-demo-python-django + # working_directory: ~/circleci-demo-python-django docker: # run the steps with Docker # CircleCI Python images available at: https://hub.docker.com/r/circleci/python/ - - image: circleci/python:3.8.5 + - image: circleci/python:3.9.1 auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference @@ -22,8 +22,8 @@ jobs: # A basic unit of work in a run POSTGRES_DB: circle_test steps: # steps that comprise the `build` job - checkout # check out source code to working directory - - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages + # - run: sudo chown -R circleci:circleci /usr/local/bin + # - run: sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages - restore_cache: # Read about caching dependencies: https://circleci.com/docs/2.0/caching/ key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} @@ -43,4 +43,50 @@ jobs: # A basic unit of work in a run path: test-results - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ path: test-results - destination: tr1 \ No newline at end of file + destination: tr1 + test: + docker: + - image: circleci/python:3.9.1 + - image: circleci/postgres:9.6.5 + environment: + POSTGRES_USER: myUsr + POSTGRES_PASSOWRD: somePwd + POSTGRES_DB: myUsr + + steps: + - checkout + - restore_cache: + key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + - run: + name: bd upgrade + command: | + pip install --user Flask + flask db init + flask db migrate + flask db upgrade + flask test + environment: + CONDUIT_SECRET: $CONDUIT_SECRET + FLASK_APP: autoapp.py + FLASK_DEBUG: 1 + DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr + - run: + name: flask test + command: | + . venv/bin/activate + sleep 1 + flask test + environment: + CONDUIT_SECRET: 'something-really-secret' + FLASK_APP: autoapp.py + FLASK_DEBUG: 1 + DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr + +workflows: + version: 2 + build-test: + jobs: + - build + - test: + requires: + - build \ No newline at end of file From 6f2b54668e49630ffdb5341c7e85511d57556fc5 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 15:23:31 +0100 Subject: [PATCH 15/47] =?UTF-8?q?=F0=9F=91=B7=20heroku=20automatic=20deplo?= =?UTF-8?q?y?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdf22da..3e6485b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,6 +44,7 @@ jobs: # A basic unit of work in a run - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ path: test-results destination: tr1 + test: docker: - image: circleci/python:3.9.1 @@ -81,12 +82,25 @@ jobs: # A basic unit of work in a run FLASK_APP: autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr + + heroku: + docker: + - image: buildpack-deps:trusty + steps: + - checkout + + - run: + name: Heroku Deploy + command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git main workflows: version: 2 build-test: jobs: - build - - test: - requires: + # - test: + # requires: + # - build + - heroku + requires - build \ No newline at end of file From 24bbc2d1e9136589f5f205843ac58fec8a4955aa Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 15:24:55 +0100 Subject: [PATCH 16/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20heroku=20automatic?= =?UTF-8?q?=20deploy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e6485b..f409fe2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,5 +102,5 @@ workflows: # requires: # - build - heroku - requires + requires: - build \ No newline at end of file From 6c8a5a1be212ce7dcb6da5bbbbd7699af09432c9 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 15:25:57 +0100 Subject: [PATCH 17/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20heroku=20automatic?= =?UTF-8?q?=20deploy=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f409fe2..e5d23e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,6 +101,6 @@ workflows: # - test: # requires: # - build - - heroku + - heroku: requires: - build \ No newline at end of file From 3fcfa22fe990932ab67297792cd8d93dec27b028 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 16:25:05 +0100 Subject: [PATCH 18/47] :whale: Created dockerfile, CLI run ok docker build -t dev_ops_back_container . --- Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5e72b99 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM python:3.9.1 + +COPY . /app + +ENV FLASK_APP=autoapp.py + +RUN pip install -r /app/requirements/dev.txt + +CMD python /app/autoapp.py \ No newline at end of file From 1190d73b048bb4a2df5d9b26441a2825a4e0b471 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 17:20:08 +0100 Subject: [PATCH 19/47] :construction_worker: docker build --- .circleci/config.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5d23e7..2e597ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,6 +92,26 @@ jobs: # A basic unit of work in a run - run: name: Heroku Deploy command: git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git main + + docker_build_push: + working_directory: /dockerapp + docker: + - image: docker:17.05.0-ce-git + steps: + - checkout + - setup_remote_docker + - run: + name: Build application Docker image + command: | + docker build --cache-from=app -t app . + - deploy: + name: Publish application to docker hub + command: | + docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD + docker tag app $DOCKER_HUB_USER_ID/my-awesome-ci-expr:$CIRCLE_BUILD_NUM + docker tag app $DOCKER_HUB_USER_ID/my-awesome-ci-expr:latest + docker push $DOCKER_HUB_USER_ID/my-awesome-ci-expr:$CIRCLE_BUILD_NUM + docker push $DOCKER_HUB_USER_ID/my-awesome-ci-expr:latest workflows: version: 2 @@ -102,5 +122,8 @@ workflows: # requires: # - build - heroku: + requires: + - build + - docker_build_push: requires: - build \ No newline at end of file From 20a59c2db60e4aca835f397b0faf0c5d036cff00 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 12 Jan 2021 17:31:50 +0100 Subject: [PATCH 20/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20docker=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e597ef..2129ccf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,11 +107,11 @@ jobs: # A basic unit of work in a run - deploy: name: Publish application to docker hub command: | - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD - docker tag app $DOCKER_HUB_USER_ID/my-awesome-ci-expr:$CIRCLE_BUILD_NUM - docker tag app $DOCKER_HUB_USER_ID/my-awesome-ci-expr:latest - docker push $DOCKER_HUB_USER_ID/my-awesome-ci-expr:$CIRCLE_BUILD_NUM - docker push $DOCKER_HUB_USER_ID/my-awesome-ci-expr:latest + docker login -e $DOCKER_HUB_EMAIL -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD + docker tag app $DOCKERHUB_USERNAME/my-awesome-ci-expr:$CIRCLE_BUILD_NUM + docker tag app $DOCKERHUB_USERNAME/my-awesome-ci-expr:latest + docker push $DOCKERHUB_USERNAME/my-awesome-ci-expr:$CIRCLE_BUILD_NUM + docker push $DOCKERHUB_USERNAME/my-awesome-ci-expr:latest workflows: version: 2 From 66d1869e1a64021c5b68e50049eb6c77538a6bda Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 12:17:56 +0100 Subject: [PATCH 21/47] :wrench: conduit/setting.py --- conduit/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conduit/settings.py b/conduit/settings.py index b838a6d..9579273 100644 --- a/conduit/settings.py +++ b/conduit/settings.py @@ -25,6 +25,7 @@ class Config(object): 'http://localhost:4200', 'http://0.0.0.0:4000', 'http://localhost:4000', + 'https://super-cool-site-by-pierredarcas.netlify.app/#/', ] JWT_HEADER_TYPE = 'Token' From 5a99db25edbd753a40ac2b6219cab2e21835dca4 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 12:28:26 +0100 Subject: [PATCH 22/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20docker=20build=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2129ccf..9a4b300 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -108,10 +108,10 @@ jobs: # A basic unit of work in a run name: Publish application to docker hub command: | docker login -e $DOCKER_HUB_EMAIL -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - docker tag app $DOCKERHUB_USERNAME/my-awesome-ci-expr:$CIRCLE_BUILD_NUM - docker tag app $DOCKERHUB_USERNAME/my-awesome-ci-expr:latest - docker push $DOCKERHUB_USERNAME/my-awesome-ci-expr:$CIRCLE_BUILD_NUM - docker push $DOCKERHUB_USERNAME/my-awesome-ci-expr:latest + docker tag app $DOCKERHUB_USERNAME/dev_ops_back_container:$CIRCLE_BUILD_NUM + docker tag app $DOCKERHUB_USERNAMEdev_ops_back_container:latest + docker push $DOCKERHUB_USERNAME/dev_ops_back_container:$CIRCLE_BUILD_NUM + docker push $DOCKERHUB_USERNAME/dev_ops_back_container:latest workflows: version: 2 From 6bab162f170a83a4543af05262b4edf2d2e9fcf7 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 12:37:28 +0100 Subject: [PATCH 23/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20docker=20build=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a4b300..852db64 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,7 @@ jobs: # A basic unit of work in a run command: | docker login -e $DOCKER_HUB_EMAIL -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD docker tag app $DOCKERHUB_USERNAME/dev_ops_back_container:$CIRCLE_BUILD_NUM - docker tag app $DOCKERHUB_USERNAMEdev_ops_back_container:latest + docker tag app $DOCKERHUB_USERNAME/dev_ops_back_container:latest docker push $DOCKERHUB_USERNAME/dev_ops_back_container:$CIRCLE_BUILD_NUM docker push $DOCKERHUB_USERNAME/dev_ops_back_container:latest From a94e583823241ed364e5fac13ebc7e7c4493208b Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 17:32:13 +0100 Subject: [PATCH 24/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 852db64..3775a58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,28 +61,31 @@ jobs: # A basic unit of work in a run - run: name: bd upgrade command: | - pip install --user Flask - flask db init + . venv/bin/activate + sleep 1 + flask db stamp head flask db migrate flask db upgrade - flask test environment: CONDUIT_SECRET: $CONDUIT_SECRET FLASK_APP: autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr - - run: - name: flask test - command: | - . venv/bin/activate - sleep 1 - flask test - environment: - CONDUIT_SECRET: 'something-really-secret' - FLASK_APP: autoapp.py - FLASK_DEBUG: 1 - DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr - + # - run: + # name: flask test + # command: | + # . venv/bin/activate + # sleep 1 + # flask test + # environment: + # CONDUIT_SECRET: 'something-really-secret' + # FLASK_APP: autoapp.py + # FLASK_DEBUG: 1 + # DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr + - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key + key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + paths: + - "venv" heroku: docker: - image: buildpack-deps:trusty @@ -118,9 +121,9 @@ workflows: build-test: jobs: - build - # - test: - # requires: - # - build + - test: + requires: + - build - heroku: requires: - build From c48666ee21af36b8378497d15f21e8e99c651425 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 17:41:26 +0100 Subject: [PATCH 25/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3775a58..4a58b80 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,6 +61,9 @@ jobs: # A basic unit of work in a run - run: name: bd upgrade command: | + python3 -m venv venv + . venv/bin/activate + pip install -r requirements/dev.txt . venv/bin/activate sleep 1 flask db stamp head From 8191a8be39db07241af413034cb80f4059fb79fc Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 17:48:13 +0100 Subject: [PATCH 26/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a58b80..3774b80 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -130,6 +130,8 @@ workflows: - heroku: requires: - build + - test - docker_build_push: requires: - - build \ No newline at end of file + - build + - test \ No newline at end of file From c1dd591c775657f594dd8400bc72a31b517332a5 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 17:57:53 +0100 Subject: [PATCH 27/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3774b80..421a6ae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,17 +9,11 @@ jobs: # A basic unit of work in a run auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - environment: # environment variables for primary container - PIPENV_VENV_IN_PROJECT: true - DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable # CircleCI PostgreSQL images available at: https://hub.docker.com/r/circleci/postgres/ - image: circleci/postgres:9.6.9-alpine auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference - environment: # environment variables for the Postgres container. - POSTGRES_USER: root - POSTGRES_DB: circle_test steps: # steps that comprise the `build` job - checkout # check out source code to working directory # - run: sudo chown -R circleci:circleci /usr/local/bin @@ -29,9 +23,9 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | - export FLASK_APP=autoapp.py - sudo pip install pipenv - pipenv install + python3 -m venv venv + . venv/bin/activate + pip install -r requirements/dev.txt - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} paths: @@ -61,9 +55,6 @@ jobs: # A basic unit of work in a run - run: name: bd upgrade command: | - python3 -m venv venv - . venv/bin/activate - pip install -r requirements/dev.txt . venv/bin/activate sleep 1 flask db stamp head From 37921c2cfe3a2df44ff2362933127f775afd738d Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 18:04:41 +0100 Subject: [PATCH 28/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 421a6ae..29419e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,11 +9,18 @@ jobs: # A basic unit of work in a run auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference + environment: # environment variables for primary container + PIPENV_VENV_IN_PROJECT: true + DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable # CircleCI PostgreSQL images available at: https://hub.docker.com/r/circleci/postgres/ - image: circleci/postgres:9.6.9-alpine auth: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD # context / project UI env-var reference + environment: # environment variables for the Postgres container. + POSTGRES_USER: circle_test + POSTGRES_PASSOWRD: pwd + POSTGRES_DB: circle_test steps: # steps that comprise the `build` job - checkout # check out source code to working directory # - run: sudo chown -R circleci:circleci /usr/local/bin @@ -44,9 +51,9 @@ jobs: # A basic unit of work in a run - image: circleci/python:3.9.1 - image: circleci/postgres:9.6.5 environment: - POSTGRES_USER: myUsr - POSTGRES_PASSOWRD: somePwd - POSTGRES_DB: myUsr + POSTGRES_USER: circle_test + POSTGRES_PASSOWRD: pwd + POSTGRES_DB: circle_test steps: - checkout @@ -64,7 +71,7 @@ jobs: # A basic unit of work in a run CONDUIT_SECRET: $CONDUIT_SECRET FLASK_APP: autoapp.py FLASK_DEBUG: 1 - DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr + DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test # - run: # name: flask test # command: | From 3c0247a7a2bce02db1712018486c1962de38d98b Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 18:10:31 +0100 Subject: [PATCH 29/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29419e9..948ae67 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,11 @@ jobs: # A basic unit of work in a run python3 -m venv venv . venv/bin/activate pip install -r requirements/dev.txt + environment: + CONDUIT_SECRET: $CONDUIT_SECRET + FLASK_APP: autoapp.py + FLASK_DEBUG: 1 + DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} paths: From 8553cbb8c844c595cf8f5de75dbc704157386680 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 18:53:50 +0100 Subject: [PATCH 30/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 948ae67..c29ac67 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,9 +42,7 @@ jobs: # A basic unit of work in a run key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} paths: - "venv" - - run: - command: | - pipenv run python autoapp.py test + - store_test_results: # Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/ path: test-results - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ From 33b0f4ae411e7ffe22f8606f3d9d4d21e87c910b Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:05:35 +0100 Subject: [PATCH 31/47] =?UTF-8?q?=F0=9F=92=9A=20fix=20db=20connection=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c29ac67..b0c3864 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ jobs: # A basic unit of work in a run test: docker: - image: circleci/python:3.9.1 - - image: circleci/postgres:9.6.5 + - image: circleci/postgres:9.6.9-alpine environment: POSTGRES_USER: circle_test POSTGRES_PASSOWRD: pwd From 8910292b8beff0f7419adf99e45a8e10e0ff6940 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:11:32 +0100 Subject: [PATCH 32/47] :heart: fix db connection 7 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0c3864..27686de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: # A basic unit of work in a run password: $DOCKERHUB_PASSWORD # context / project UI env-var reference environment: # environment variables for primary container PIPENV_VENV_IN_PROJECT: true - DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable + DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test # CircleCI PostgreSQL images available at: https://hub.docker.com/r/circleci/postgres/ - image: circleci/postgres:9.6.9-alpine auth: From 4c38de0de4077aa8c2e8d404d21012edf3347c65 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:15:37 +0100 Subject: [PATCH 33/47] :heart: fix db connection 8 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27686de..2002a7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,7 @@ jobs: # A basic unit of work in a run POSTGRES_USER: circle_test POSTGRES_PASSOWRD: pwd POSTGRES_DB: circle_test + working_directory: ~/repo steps: # steps that comprise the `build` job - checkout # check out source code to working directory # - run: sudo chown -R circleci:circleci /usr/local/bin @@ -57,7 +58,7 @@ jobs: # A basic unit of work in a run POSTGRES_USER: circle_test POSTGRES_PASSOWRD: pwd POSTGRES_DB: circle_test - + working_directory: ~/repo steps: - checkout - restore_cache: From 861ca8c3f72fb53c0838e2118b20e3d37607a64e Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:18:36 +0100 Subject: [PATCH 34/47] :heart: fix db connection 9 --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 60df632..a96c523 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 +web: flask db upgrade;gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 From b6c65706cb05f0c618ca59a7488aef43fd35ee97 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:23:44 +0100 Subject: [PATCH 35/47] :heart: fix db connection 10 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2002a7e..1241f2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ jobs: # A basic unit of work in a run pip install -r requirements/dev.txt environment: CONDUIT_SECRET: $CONDUIT_SECRET - FLASK_APP: autoapp.py + FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key @@ -73,7 +73,7 @@ jobs: # A basic unit of work in a run flask db upgrade environment: CONDUIT_SECRET: $CONDUIT_SECRET - FLASK_APP: autoapp.py + FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test # - run: From 4880714062e1e25f7d605d7a651aa94494ee1aba Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:28:44 +0100 Subject: [PATCH 36/47] :heart: fix db connection 10 --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1241f2b..4c108ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,8 +68,6 @@ jobs: # A basic unit of work in a run command: | . venv/bin/activate sleep 1 - flask db stamp head - flask db migrate flask db upgrade environment: CONDUIT_SECRET: $CONDUIT_SECRET From 86355e68612e22a755338ea4d497be492441a289 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:32:28 +0100 Subject: [PATCH 37/47] :heart: fix db connection 11 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c108ff..d5907e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,7 +66,7 @@ jobs: # A basic unit of work in a run - run: name: bd upgrade command: | - . venv/bin/activate + source venv/bin/activate sleep 1 flask db upgrade environment: From 5f17ed4f4b473fdf4a2a2263d6bf16ef526b9341 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:37:41 +0100 Subject: [PATCH 38/47] :heart: fix db connection 12 --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5907e9..20926e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 # use CircleCI 2.0 jobs: # A basic unit of work in a run build: # runs not using Workflows must have a `build` job as entry point # directory where steps are run - # working_directory: ~/circleci-demo-python-django + working_directory: ~/circleci-demo-python-django docker: # run the steps with Docker # CircleCI Python images available at: https://hub.docker.com/r/circleci/python/ - image: circleci/python:3.9.1 @@ -21,7 +21,6 @@ jobs: # A basic unit of work in a run POSTGRES_USER: circle_test POSTGRES_PASSOWRD: pwd POSTGRES_DB: circle_test - working_directory: ~/repo steps: # steps that comprise the `build` job - checkout # check out source code to working directory # - run: sudo chown -R circleci:circleci /usr/local/bin @@ -58,7 +57,7 @@ jobs: # A basic unit of work in a run POSTGRES_USER: circle_test POSTGRES_PASSOWRD: pwd POSTGRES_DB: circle_test - working_directory: ~/repo + working_directory: ~/circleci-demo-python-django steps: - checkout - restore_cache: @@ -66,7 +65,7 @@ jobs: # A basic unit of work in a run - run: name: bd upgrade command: | - source venv/bin/activate + . venv/bin/activate sleep 1 flask db upgrade environment: @@ -92,6 +91,7 @@ jobs: # A basic unit of work in a run heroku: docker: - image: buildpack-deps:trusty + working_directory: ~/circleci-demo-python-django steps: - checkout From 6a880225399b9fd0a56247c1583bbf1b1a729b54 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:46:58 +0100 Subject: [PATCH 39/47] :heart: fix cache restore --- .circleci/config.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 20926e8..a24367a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 # use CircleCI 2.0 jobs: # A basic unit of work in a run build: # runs not using Workflows must have a `build` job as entry point # directory where steps are run - working_directory: ~/circleci-demo-python-django + working_directory: ~/repo docker: # run the steps with Docker # CircleCI Python images available at: https://hub.docker.com/r/circleci/python/ - image: circleci/python:3.9.1 @@ -40,6 +40,7 @@ jobs: # A basic unit of work in a run DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + paths: - "venv" @@ -61,9 +62,10 @@ jobs: # A basic unit of work in a run steps: - checkout - restore_cache: - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + key: + - deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + - deps9-{{ .Branch }}- - run: - name: bd upgrade command: | . venv/bin/activate sleep 1 @@ -73,17 +75,7 @@ jobs: # A basic unit of work in a run FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - # - run: - # name: flask test - # command: | - # . venv/bin/activate - # sleep 1 - # flask test - # environment: - # CONDUIT_SECRET: 'something-really-secret' - # FLASK_APP: autoapp.py - # FLASK_DEBUG: 1 - # DATABASE_URL: postgresql://myUsr:somePwd@localhost:5432/myUsr + - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} paths: From 663ccd2cd56fbc1456a75055b20327072d0fbdca Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 19:49:45 +0100 Subject: [PATCH 40/47] :heart: fix cache restore 2 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a24367a..e7e8649 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ jobs: # A basic unit of work in a run steps: - checkout - restore_cache: - key: + keys: - deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - deps9-{{ .Branch }}- - run: From 4c3a609ad5196514461c1dd954ee240b88a48822 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 21:53:37 +0100 Subject: [PATCH 41/47] :heart: fix cache restore 3 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7e8649..86b13ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,7 +58,7 @@ jobs: # A basic unit of work in a run POSTGRES_USER: circle_test POSTGRES_PASSOWRD: pwd POSTGRES_DB: circle_test - working_directory: ~/circleci-demo-python-django + working_directory: ~/repo steps: - checkout - restore_cache: @@ -83,7 +83,7 @@ jobs: # A basic unit of work in a run heroku: docker: - image: buildpack-deps:trusty - working_directory: ~/circleci-demo-python-django + working_directory: ~/repo steps: - checkout From 6de14bd451dd4e82169eb3225bc71d2d444966e6 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 22:48:03 +0100 Subject: [PATCH 42/47] :heart: fix cache restore 4 --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86b13ff..eb189e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ jobs: # A basic unit of work in a run # - run: sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages - restore_cache: # Read about caching dependencies: https://circleci.com/docs/2.0/caching/ - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + key: deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - run: command: | python3 -m venv venv @@ -39,7 +39,7 @@ jobs: # A basic unit of work in a run FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + key: deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} paths: - "venv" @@ -63,7 +63,7 @@ jobs: # A basic unit of work in a run - checkout - restore_cache: keys: - - deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + - deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - deps9-{{ .Branch }}- - run: command: | @@ -77,7 +77,7 @@ jobs: # A basic unit of work in a run DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} + key: deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} paths: - "venv" heroku: From e0d527d53e6ac9ce47d1b39d70b5ed7ab082e037 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 23:01:42 +0100 Subject: [PATCH 43/47] :heart: fix environement --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb189e9..69ae808 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: # A basic unit of work in a run . venv/bin/activate pip install -r requirements/dev.txt environment: - CONDUIT_SECRET: $CONDUIT_SECRET + CONDUIT_SECRET: "something-really-secret" FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test @@ -71,7 +71,7 @@ jobs: # A basic unit of work in a run sleep 1 flask db upgrade environment: - CONDUIT_SECRET: $CONDUIT_SECRET + CONDUIT_SECRET: "something-really-secret" FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test From 2117270027c973e4d36eb7dc9b703048ecd1a0ca Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 23:12:51 +0100 Subject: [PATCH 44/47] :heart: fix db connection 13 --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69ae808..342456d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,7 +69,10 @@ jobs: # A basic unit of work in a run command: | . venv/bin/activate sleep 1 + flask db stamp head + flask db migrate flask db upgrade + # flask db test environment: CONDUIT_SECRET: "something-really-secret" FLASK_APP: /home/circleci/repo/autoapp.py From 654e17c1be6416a537727306c5d700e331aa9d45 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 23:38:21 +0100 Subject: [PATCH 45/47] :heart: fix db connection 14 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 342456d..e470015 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ jobs: # A basic unit of work in a run pip install -r requirements/dev.txt environment: CONDUIT_SECRET: "something-really-secret" - FLASK_APP: /home/circleci/repo/autoapp.py + FLASK_APP: autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key @@ -75,7 +75,7 @@ jobs: # A basic unit of work in a run # flask db test environment: CONDUIT_SECRET: "something-really-secret" - FLASK_APP: /home/circleci/repo/autoapp.py + FLASK_APP: autoapp.py FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test From c2c2a70f3e75b20d701a0e23d7f5b1f234f7686e Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 23:46:28 +0100 Subject: [PATCH 46/47] :heart: fix db connection 14 --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index a96c523..74d92ae 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: flask db upgrade;gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 +web: gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 \ No newline at end of file From 13126c63d7a62429be66aba27ae1f55507ecf107 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 17 Jan 2021 23:51:38 +0100 Subject: [PATCH 47/47] :heart: fix db connection 15 --- .circleci/config.yml | 10 +++++----- Procfile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e470015..052a922 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ jobs: # A basic unit of work in a run # - run: sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages - restore_cache: # Read about caching dependencies: https://circleci.com/docs/2.0/caching/ - key: deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} + key: deps10-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - run: command: | python3 -m venv venv @@ -39,7 +39,7 @@ jobs: # A basic unit of work in a run FLASK_DEBUG: 1 DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key - key: deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} + key: deps10-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} paths: - "venv" @@ -63,8 +63,8 @@ jobs: # A basic unit of work in a run - checkout - restore_cache: keys: - - deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - - deps9-{{ .Branch }}- + - deps10-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} + - deps10-{{ .Branch }}- - run: command: | . venv/bin/activate @@ -80,7 +80,7 @@ jobs: # A basic unit of work in a run DATABASE_URL: postgresql://circle_test:pwd@localhost:5432/circle_test - save_cache: # cache Python dependencies using checksum of Pipfile as the cache-key - key: deps9-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} + key: deps10-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} paths: - "venv" heroku: diff --git a/Procfile b/Procfile index 74d92ae..a96c523 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 \ No newline at end of file +web: flask db upgrade;gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3