From fb7e8232ff41108d9a1c2dd7216848852e098ea1 Mon Sep 17 00:00:00 2001 From: Jerrica Bobadilla Date: Thu, 12 Jan 2023 11:42:47 -0800 Subject: [PATCH 1/4] update workflow --- .github/workflows/canvas-sync-codegrade.yml | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/canvas-sync-codegrade.yml diff --git a/.github/workflows/canvas-sync-codegrade.yml b/.github/workflows/canvas-sync-codegrade.yml new file mode 100644 index 000000000..baacfa810 --- /dev/null +++ b/.github/workflows/canvas-sync-codegrade.yml @@ -0,0 +1,31 @@ +name: Sync with Canvas CodeGrade + +on: + push: + branches: [master, main] + paths: + - "README.md" + +jobs: + sync: + name: Sync with Canvas + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + + - name: Install github-to-canvas + run: gem install github-to-canvas + + # Secret stored in learn-co-curriculum Settings/Secrets + - name: Sync from .canvas file + run: github-to-canvas -a -lr --contains-html + env: + CANVAS_API_KEY: ${{ secrets.CANVAS_API_KEY }} + CANVAS_API_PATH: ${{ secrets.CANVAS_API_PATH }} From 53332c196eed8818b67cf959bedfc37104eaf79f Mon Sep 17 00:00:00 2001 From: Ben Botsford Date: Tue, 24 Jan 2023 14:41:06 -0600 Subject: [PATCH 2/4] update pipfiles --- Pipfile | 2 +- Pipfile.lock | 279 +++++++++--------- {app => lib}/alembic.ini | 0 {app => lib}/debug.py | 0 {app => lib}/freebies.db | Bin {app => lib}/migrations/README | 0 {app => lib}/migrations/env.py | 0 {app => lib}/migrations/script.py.mako | 0 .../c4d7867d81f5_create_freebies_db.py | 0 .../ee905476242e_add_companies_devs_tables.py | 0 {app => lib}/models.py | 0 {app => lib}/seed.py | 0 12 files changed, 142 insertions(+), 139 deletions(-) rename {app => lib}/alembic.ini (100%) rename {app => lib}/debug.py (100%) rename {app => lib}/freebies.db (100%) rename {app => lib}/migrations/README (100%) rename {app => lib}/migrations/env.py (100%) rename {app => lib}/migrations/script.py.mako (100%) rename {app => lib}/migrations/versions/c4d7867d81f5_create_freebies_db.py (100%) rename {app => lib}/migrations/versions/ee905476242e_add_companies_devs_tables.py (100%) rename {app => lib}/models.py (100%) rename {app => lib}/seed.py (100%) diff --git a/Pipfile b/Pipfile index 69b5c0c8b..63c79cd98 100644 --- a/Pipfile +++ b/Pipfile @@ -5,7 +5,7 @@ name = "pypi" [packages] alembic = "1.8.1" -importlib-metadata = "5.0.0" +importlib-metadata = "6.0.0" importlib-resources = "5.10.0" ipdb = "0.13.9" sqlalchemy = "1.4.42" diff --git a/Pipfile.lock b/Pipfile.lock index 17f9772e6..3923f4a97 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ccd5d9b4e33b29fa43c20854a12ab567ec002ca24151176d66c12b59ccc2dae5" + "sha256": "fa62c636b7ae5acb4993fc7b007a651c55b562aa29962a9a8585ec314b352ae6" }, "pipfile-spec": 6, "requires": { @@ -18,11 +18,11 @@ "default": { "alembic": { "hashes": [ - "sha256:0a024d7f2de88d738d7395ff866997314c837be6104e90c5724350313dee4da4", - "sha256:cd0b5e45b14b706426b833f06369b9a6d5ee03f826ec3238723ce8caaf6e5ffa" + "sha256:6880dec4f28dd7bd999d2ed13fbe7c9d4337700a44d11a524c0ce0c59aaf0dbd", + "sha256:e8a6ff9f3b1887e1fed68bfb8fb9a000d8f61c21bdcc85b67bb9f87fcbc4fce3" ], "index": "pypi", - "version": "==1.8.1" + "version": "==1.9.2" }, "appnope": { "hashes": [ @@ -34,10 +34,10 @@ }, "asttokens": { "hashes": [ - "sha256:1b28ed85e254b724439afc783d4bee767f780b936c3fe8b3275332f42cf5f561", - "sha256:4aa76401a151c8cc572d906aad7aea2a841780834a19d780f4321c0fe1b54635" + "sha256:4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3", + "sha256:6b0ac9e93fb0335014d382b8fa9b3afa7df546984258005da0b9e7095b3deb1c" ], - "version": "==2.1.0" + "version": "==2.2.1" }, "backcall": { "hashes": [ @@ -51,7 +51,7 @@ "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330", "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186" ], - "markers": "python_version >= '3.7'", + "markers": "python_version < '3.11' and python_version >= '3.7'", "version": "==5.1.1" }, "executing": { @@ -63,42 +63,43 @@ }, "importlib-metadata": { "hashes": [ - "sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab", - "sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43" + "sha256:7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad", + "sha256:e354bedeb60efa6affdcc8ae121b73544a7aa74156d047311948f6d711cd378d" ], "index": "pypi", - "version": "==5.0.0" + "version": "==6.0.0" }, "importlib-resources": { "hashes": [ - "sha256:c01b1b94210d9849f286b86bb51bcea7cd56dde0600d8db721d7b81330711668", - "sha256:ee17ec648f85480d523596ce49eae8ead87d5631ae1551f913c0100b5edd3437" + "sha256:7d543798b0beca10b6a01ac7cafda9f822c54db9e8376a6bf57e0cbd74d486b6", + "sha256:e4a96c8cc0339647ff9a5e0550d9f276fc5a01ffa276012b58ec108cfd7b8484" ], "index": "pypi", - "version": "==5.10.0" + "version": "==5.10.2" }, "ipdb": { "hashes": [ - "sha256:951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5" + "sha256:c23b6736f01fd4586cc2ecbebdf79a5eb454796853e1cd8f2ed3b7b91d4a3e93", + "sha256:f74c2f741c18b909eaf89f19fde973f745ac721744aa1465888ce45813b63a9c" ], "index": "pypi", - "version": "==0.13.9" + "version": "==0.13.11" }, "ipython": { "hashes": [ - "sha256:7c959e3dedbf7ed81f9b9d8833df252c430610e2a4a6464ec13cd20975ce20a5", - "sha256:91ef03016bcf72dd17190f863476e7c799c6126ec7e8be97719d1bc9a78a59a4" + "sha256:da01e6df1501e6e7c32b5084212ddadd4ee2471602e2cf3e0190f4de6b0ea481", + "sha256:f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b" ], - "markers": "python_version >= '3.7'", - "version": "==8.6.0" + "markers": "python_version < '3.11' and python_version >= '3.7'", + "version": "==8.8.0" }, "jedi": { "hashes": [ - "sha256:637c9635fcf47945ceb91cd7f320234a7be540ded6f3e99a50cb6febdfd1ba8d", - "sha256:74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab" + "sha256:203c1fd9d969ab8f2119ec0a3342e0b49910045abe6af0a3ae83a5764d54639e", + "sha256:bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612" ], "markers": "python_version >= '3.6'", - "version": "==0.18.1" + "version": "==0.18.2" }, "mako": { "hashes": [ @@ -110,49 +111,59 @@ }, "markupsafe": { "hashes": [ - "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003", - "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88", - "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5", - "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7", - "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a", - "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603", - "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1", - "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135", - "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247", - "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6", - "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601", - "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77", - "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02", - "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e", - "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63", - "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f", - "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980", - "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b", - "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812", - "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff", - "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96", - "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1", - "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925", - "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a", - "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6", - "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e", - "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f", - "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4", - "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f", - "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3", - "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c", - "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a", - "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417", - "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a", - "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a", - "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37", - "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452", - "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933", - "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a", - "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7" + "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed", + "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc", + "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2", + "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460", + "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7", + "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0", + "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1", + "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa", + "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03", + "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323", + "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65", + "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013", + "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036", + "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f", + "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4", + "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419", + "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2", + "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619", + "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a", + "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a", + "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd", + "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7", + "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666", + "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65", + "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859", + "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625", + "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff", + "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156", + "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd", + "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba", + "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f", + "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1", + "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094", + "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a", + "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513", + "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed", + "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d", + "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3", + "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147", + "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c", + "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603", + "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601", + "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a", + "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1", + "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d", + "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3", + "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54", + "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2", + "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6", + "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58" ], "markers": "python_version >= '3.7'", - "version": "==2.1.1" + "version": "==2.1.2" }, "matplotlib-inline": { "hashes": [ @@ -187,11 +198,11 @@ }, "prompt-toolkit": { "hashes": [ - "sha256:535c29c31216c77302877d5120aef6c94ff573748a5b5ca5b1b1f76f5e700c73", - "sha256:ced598b222f6f4029c0800cefaa6a17373fb580cd093223003475ce32805c35b" + "sha256:3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63", + "sha256:aa64ad242a462c5ff0363a7b9cfe696c20d55d9fc60c11fd8e632d064804d305" ], "markers": "python_full_version >= '3.6.2'", - "version": "==3.0.33" + "version": "==3.0.36" }, "ptyprocess": { "hashes": [ @@ -209,19 +220,11 @@ }, "pygments": { "hashes": [ - "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1", - "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42" + "sha256:b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297", + "sha256:fa7bd7bd2771287c0de303af8bfdfc731f51bd2c6a47ab69d117138893b82717" ], "markers": "python_version >= '3.6'", - "version": "==2.13.0" - }, - "setuptools": { - "hashes": [ - "sha256:6211d2f5eddad8757bd0484923ca7c0a6302ebc4ab32ea5e94357176e0ca0840", - "sha256:d1eebf881c6114e51df1664bc2c9133d022f78d12d5f4f665b9191f084e2862d" - ], - "markers": "python_version >= '3.7'", - "version": "==65.6.0" + "version": "==2.14.0" }, "six": { "hashes": [ @@ -233,88 +236,88 @@ }, "sqlalchemy": { "hashes": [ - "sha256:0be9b479c5806cece01f1581726573a8d6515f8404e082c375b922c45cfc2a7b", - "sha256:17aee7bfcef7bf0dea92f10e5dfdd67418dcf6fe0759f520e168b605855c003e", - "sha256:21f3df74a0ab39e1255e94613556e33c1dc3b454059fe0b365ec3bbb9ed82e4a", - "sha256:237067ba0ef45a518b64606e1807f7229969ad568288b110ed5f0ca714a3ed3a", - "sha256:2dda5f96719ae89b3ec0f1b79698d86eb9aecb1d54e990abb3fdd92c04b46a90", - "sha256:393f51a09778e8984d735b59a810731394308b4038acdb1635397c2865dae2b6", - "sha256:3ca21b35b714ce36f4b8d1ee8d15f149db8eb43a472cf71600bf18dae32286e7", - "sha256:3cbdbed8cdcae0f83640a9c44fa02b45a6c61e149c58d45a63c9581aba62850f", - "sha256:3eba07f740488c3a125f17c092a81eeae24a6c7ec32ac9dbc52bf7afaf0c4f16", - "sha256:3f68eab46649504eb95be36ca529aea16cd199f080726c28cbdbcbf23d20b2a2", - "sha256:4c56e6899fa6e767e4be5d106941804a4201c5cb9620a409c0b80448ec70b656", - "sha256:53f90a2374f60e703c94118d21533765412da8225ba98659de7dd7998641ab17", - "sha256:595b185041a4dc5c685283ea98c2f67bbfa47bb28e4a4f5b27ebf40684e7a9f8", - "sha256:65a0ad931944fcb0be12a8e0ac322dbd3ecf17c53f088bc10b6da8f0caac287b", - "sha256:68e0cd5d32a32c4395168d42f2fefbb03b817ead3a8f3704b8bd5697c0b26c24", - "sha256:6a06c2506c41926d2769f7968759995f2505e31c5b5a0821e43ca5a3ddb0e8ae", - "sha256:6d7e1b28342b45f19e3dea7873a9479e4a57e15095a575afca902e517fb89652", - "sha256:6f0ea4d7348feb5e5d0bf317aace92e28398fa9a6e38b7be9ec1f31aad4a8039", - "sha256:7313e4acebb9ae88dbde14a8a177467a7625b7449306c03a3f9f309b30e163d0", - "sha256:7cf7c7adbf4417e3f46fc5a2dbf8395a5a69698217337086888f79700a12e93a", - "sha256:80ead36fb1d676cc019586ffdc21c7e906ce4bf243fe4021e4973dae332b6038", - "sha256:9470633395e5f24d6741b4c8a6e905bce405a28cf417bba4ccbaadf3dab0111d", - "sha256:94c0093678001f5d79f2dcbf3104c54d6c89e41ab50d619494c503a4d3f1aef2", - "sha256:95f4f8d62589755b507218f2e3189475a4c1f5cc9db2aec772071a7dc6cd5726", - "sha256:9c857676d810ca196be73c98eb839125d6fa849bfa3589be06201a6517f9961c", - "sha256:a22208c1982f1fe2ae82e5e4c3d4a6f2445a7a0d65fb7983a3d7cbbe3983f5a4", - "sha256:ad5f966623905ee33694680dda1b735544c99c7638f216045d21546d3d8c6f5b", - "sha256:ae1ed1ebc407d2f66c6f0ec44ef7d56e3f455859df5494680e2cf89dad8e3ae0", - "sha256:afd1ac99179d1864a68c06b31263a08ea25a49df94e272712eb2824ef151e294", - "sha256:b6a337a2643a41476fb6262059b8740f4b9a2ec29bf00ffb18c18c080f6e0aed", - "sha256:b737fbeb2f78926d1f59964feb287bbbd050e7904766f87c8ce5cfb86e6d840c", - "sha256:c46322354c58d4dc039a2c982d28284330f8919f31206894281f4b595b9d8dbe", - "sha256:c7e3b9e01fdbe1ce3a165cc7e1ff52b24813ee79c6df6dee0d1e13888a97817e", - "sha256:c9aa372b295a36771cffc226b6517df3011a7d146ac22d19fa6a75f1cdf9d7e6", - "sha256:d3b6d4588994da73567bb00af9d7224a16c8027865a8aab53ae9be83f9b7cbd1", - "sha256:d3b9ac11f36ab9a726097fba7c7f6384f0129aedb017f1d4d1d4fce9052a1320", - "sha256:d654870a66027af3a26df1372cf7f002e161c6768ebe4c9c6fdc0da331cb5173", - "sha256:d8080bc51a775627865e0f1dbfc0040ff4ace685f187f6036837e1727ba2ed10", - "sha256:da60b98b0f6f0df9fbf8b72d67d13b73aa8091923a48af79a951d4088530a239", - "sha256:f5e8ed9cde48b76318ab989deeddc48f833d2a6a7b7c393c49b704f67dedf01d", - "sha256:f8e5443295b218b08bef8eb85d31b214d184b3690d99a33b7bd8e5591e2b0aa1" + "sha256:07e48cbcdda6b8bc7a59d6728bd3f5f574ffe03f2c9fb384239f3789c2d95c2e", + "sha256:18cafdb27834fa03569d29f571df7115812a0e59fd6a3a03ccb0d33678ec8420", + "sha256:1b1e5e96e2789d89f023d080bee432e2fef64d95857969e70d3cadec80bd26f0", + "sha256:315676344e3558f1f80d02535f410e80ea4e8fddba31ec78fe390eff5fb8f466", + "sha256:31de1e2c45e67a5ec1ecca6ec26aefc299dd5151e355eb5199cd9516b57340be", + "sha256:3d94682732d1a0def5672471ba42a29ff5e21bb0aae0afa00bb10796fc1e28dd", + "sha256:3ec187acf85984263299a3f15c34a6c0671f83565d86d10f43ace49881a82718", + "sha256:4847f4b1d822754e35707db913396a29d874ee77b9c3c3ef3f04d5a9a6209618", + "sha256:4d112b0f3c1bc5ff70554a97344625ef621c1bfe02a73c5d97cac91f8cd7a41e", + "sha256:51e1ba2884c6a2b8e19109dc08c71c49530006c1084156ecadfaadf5f9b8b053", + "sha256:535377e9b10aff5a045e3d9ada8a62d02058b422c0504ebdcf07930599890eb0", + "sha256:5dbf17ac9a61e7a3f1c7ca47237aac93cabd7f08ad92ac5b96d6f8dea4287fc1", + "sha256:5f752676fc126edc1c4af0ec2e4d2adca48ddfae5de46bb40adbd3f903eb2120", + "sha256:64cb0ad8a190bc22d2112001cfecdec45baffdf41871de777239da6a28ed74b6", + "sha256:6913b8247d8a292ef8315162a51931e2b40ce91681f1b6f18f697045200c4a30", + "sha256:69fac0a7054d86b997af12dc23f581cf0b25fb1c7d1fed43257dee3af32d3d6d", + "sha256:7001f16a9a8e06488c3c7154827c48455d1c1507d7228d43e781afbc8ceccf6d", + "sha256:7b81b1030c42b003fc10ddd17825571603117f848814a344d305262d370e7c34", + "sha256:7f8267682eb41a0584cf66d8a697fef64b53281d01c93a503e1344197f2e01fe", + "sha256:887865924c3d6e9a473dc82b70977395301533b3030d0f020c38fd9eba5419f2", + "sha256:9167d4227b56591a4cc5524f1b79ccd7ea994f36e4c648ab42ca995d28ebbb96", + "sha256:939f9a018d2ad04036746e15d119c0428b1e557470361aa798e6e7d7f5875be0", + "sha256:955162ad1a931fe416eded6bb144ba891ccbf9b2e49dc7ded39274dd9c5affc5", + "sha256:984ee13543a346324319a1fb72b698e521506f6f22dc37d7752a329e9cd00a32", + "sha256:9883f5fae4fd8e3f875adc2add69f8b945625811689a6c65866a35ee9c0aea23", + "sha256:a1ad90c97029cc3ab4ffd57443a20fac21d2ec3c89532b084b073b3feb5abff3", + "sha256:a3714e5b33226131ac0da60d18995a102a17dddd42368b7bdd206737297823ad", + "sha256:ae067ab639fa499f67ded52f5bc8e084f045d10b5ac7bb928ae4ca2b6c0429a5", + "sha256:b33ffbdbbf5446cf36cd4cc530c9d9905d3c2fe56ed09e25c22c850cdb9fac92", + "sha256:b6e4cb5c63f705c9d546a054c60d326cbde7421421e2d2565ce3e2eee4e1a01f", + "sha256:b7f4b6aa6e87991ec7ce0e769689a977776db6704947e562102431474799a857", + "sha256:c04144a24103135ea0315d459431ac196fe96f55d3213bfd6d39d0247775c854", + "sha256:c522e496f9b9b70296a7675272ec21937ccfc15da664b74b9f58d98a641ce1b6", + "sha256:c5a99282848b6cae0056b85da17392a26b2d39178394fc25700bcf967e06e97a", + "sha256:c7a46639ba058d320c9f53a81db38119a74b8a7a1884df44d09fbe807d028aaf", + "sha256:d4b1cc7835b39835c75cf7c20c926b42e97d074147c902a9ebb7cf2c840dc4e2", + "sha256:d4d164df3d83d204c69f840da30b292ac7dc54285096c6171245b8d7807185aa", + "sha256:d61e9ecc849d8d44d7f80894ecff4abe347136e9d926560b818f6243409f3c86", + "sha256:d68e1762997bfebf9e5cf2a9fd0bcf9ca2fdd8136ce7b24bbd3bbfa4328f3e4a", + "sha256:e3c1808008124850115a3f7e793a975cfa5c8a26ceeeb9ff9cbb4485cac556df", + "sha256:f8cb80fe8d14307e4124f6fad64dfd87ab749c9d275f82b8b4ec84c84ecebdbe" ], "index": "pypi", - "version": "==1.4.44" + "version": "==1.4.46" }, "stack-data": { "hashes": [ - "sha256:6c9a10eb5f342415fe085db551d673955611afb821551f554d91772415464315", - "sha256:960cb054d6a1b2fdd9cbd529e365b3c163e8dabf1272e02cfe36b58403cff5c6" + "sha256:32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815", + "sha256:cbb2a53eb64e5785878201a97ed7c7b94883f48b87bfb0bbe8b623c74679e4a8" ], - "version": "==0.6.1" + "version": "==0.6.2" }, - "toml": { + "tomli": { "hashes": [ - "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", - "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", + "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version >= '3.7'", - "version": "==0.10.2" + "markers": "python_version < '3.11' and python_version >= '3.7'", + "version": "==2.0.1" }, "traitlets": { "hashes": [ - "sha256:1201b2c9f76097195989cdf7f65db9897593b0dfd69e4ac96016661bb6f0d30f", - "sha256:b122f9ff2f2f6c1709dab289a05555be011c87828e911c0cf4074b85cb780a79" + "sha256:32500888f5ff7bbf3b9267ea31748fa657aaf34d56d85e60f91dda7dc7f5785b", + "sha256:a1ca5df6414f8b5760f7c5f256e326ee21b581742114545b462b35ffe3f04861" ], "markers": "python_version >= '3.7'", - "version": "==5.5.0" + "version": "==5.8.1" }, "wcwidth": { "hashes": [ - "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784", - "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83" + "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e", + "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0" ], - "version": "==0.2.5" + "version": "==0.2.6" }, "zipp": { "hashes": [ - "sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1", - "sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8" + "sha256:83a28fcb75844b5c0cdaf5aa4003c2d728c77e05f5aeabe8e95e56727005fbaa", + "sha256:a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766" ], - "markers": "python_version >= '3.7'", - "version": "==3.10.0" + "markers": "python_version < '3.10'", + "version": "==3.11.0" } }, "develop": {} diff --git a/app/alembic.ini b/lib/alembic.ini similarity index 100% rename from app/alembic.ini rename to lib/alembic.ini diff --git a/app/debug.py b/lib/debug.py similarity index 100% rename from app/debug.py rename to lib/debug.py diff --git a/app/freebies.db b/lib/freebies.db similarity index 100% rename from app/freebies.db rename to lib/freebies.db diff --git a/app/migrations/README b/lib/migrations/README similarity index 100% rename from app/migrations/README rename to lib/migrations/README diff --git a/app/migrations/env.py b/lib/migrations/env.py similarity index 100% rename from app/migrations/env.py rename to lib/migrations/env.py diff --git a/app/migrations/script.py.mako b/lib/migrations/script.py.mako similarity index 100% rename from app/migrations/script.py.mako rename to lib/migrations/script.py.mako diff --git a/app/migrations/versions/c4d7867d81f5_create_freebies_db.py b/lib/migrations/versions/c4d7867d81f5_create_freebies_db.py similarity index 100% rename from app/migrations/versions/c4d7867d81f5_create_freebies_db.py rename to lib/migrations/versions/c4d7867d81f5_create_freebies_db.py diff --git a/app/migrations/versions/ee905476242e_add_companies_devs_tables.py b/lib/migrations/versions/ee905476242e_add_companies_devs_tables.py similarity index 100% rename from app/migrations/versions/ee905476242e_add_companies_devs_tables.py rename to lib/migrations/versions/ee905476242e_add_companies_devs_tables.py diff --git a/app/models.py b/lib/models.py similarity index 100% rename from app/models.py rename to lib/models.py diff --git a/app/seed.py b/lib/seed.py similarity index 100% rename from app/seed.py rename to lib/seed.py From b9ed9db5d5a4eb7f76b7e5f1c43b5b125a27b110 Mon Sep 17 00:00:00 2001 From: Ben Botsford Date: Wed, 15 Mar 2023 15:06:33 -0500 Subject: [PATCH 3/4] update env.py, models.py --- lib/freebies.db | Bin 20480 -> 20480 bytes lib/migrations/env.py | 2 +- ... => 5f72c58bf48c_create_companies_devs.py} | 12 ++++++------ ...eebies_db.py => 7a71dbf71c64_create_db.py} | 8 ++++---- lib/models.py | 12 ++++++++---- 5 files changed, 19 insertions(+), 15 deletions(-) rename lib/migrations/versions/{ee905476242e_add_companies_devs_tables.py => 5f72c58bf48c_create_companies_devs.py} (82%) rename lib/migrations/versions/{c4d7867d81f5_create_freebies_db.py => 7a71dbf71c64_create_db.py} (67%) diff --git a/lib/freebies.db b/lib/freebies.db index 271836bca14f8d717e3d32909043488fb274d1cb..12beb1c963e832db481e7a7493e3029e691ac4dc 100644 GIT binary patch delta 48 tcmZozz}T>WaY7PPyzIu53GzIqY34@BrWQ$QCKkz?6u$7I2rM#C004rv4=exx delta 48 tcmZozz}T>WaY7PPxW~qn3GzItsg?$&Cgx^FCPt~76u$7I2rM#C004Z|4ut>! diff --git a/lib/migrations/env.py b/lib/migrations/env.py index f0c8fe63d..c7aab9656 100644 --- a/lib/migrations/env.py +++ b/lib/migrations/env.py @@ -66,7 +66,7 @@ def run_migrations_online() -> None: with connectable.connect() as connection: context.configure( - connection=connection, target_metadata=target_metadata + connection=connection, target_metadata=target_metadata, render_as_batch=True, ) with context.begin_transaction(): diff --git a/lib/migrations/versions/ee905476242e_add_companies_devs_tables.py b/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py similarity index 82% rename from lib/migrations/versions/ee905476242e_add_companies_devs_tables.py rename to lib/migrations/versions/5f72c58bf48c_create_companies_devs.py index 3adc1353f..c191bb2f9 100644 --- a/lib/migrations/versions/ee905476242e_add_companies_devs_tables.py +++ b/lib/migrations/versions/5f72c58bf48c_create_companies_devs.py @@ -1,8 +1,8 @@ -"""add companies, devs tables +"""create companies, devs -Revision ID: ee905476242e -Revises: c4d7867d81f5 -Create Date: 2022-11-02 14:15:14.386683 +Revision ID: 5f72c58bf48c +Revises: 7a71dbf71c64 +Create Date: 2023-03-15 15:06:20.944586 """ from alembic import op @@ -10,8 +10,8 @@ # revision identifiers, used by Alembic. -revision = 'ee905476242e' -down_revision = 'c4d7867d81f5' +revision = '5f72c58bf48c' +down_revision = '7a71dbf71c64' branch_labels = None depends_on = None diff --git a/lib/migrations/versions/c4d7867d81f5_create_freebies_db.py b/lib/migrations/versions/7a71dbf71c64_create_db.py similarity index 67% rename from lib/migrations/versions/c4d7867d81f5_create_freebies_db.py rename to lib/migrations/versions/7a71dbf71c64_create_db.py index da258dc89..23e0a655b 100644 --- a/lib/migrations/versions/c4d7867d81f5_create_freebies_db.py +++ b/lib/migrations/versions/7a71dbf71c64_create_db.py @@ -1,8 +1,8 @@ -"""create freebies.db +"""create db -Revision ID: c4d7867d81f5 +Revision ID: 7a71dbf71c64 Revises: -Create Date: 2022-11-02 14:14:44.979104 +Create Date: 2023-03-15 15:05:55.516631 """ from alembic import op @@ -10,7 +10,7 @@ # revision identifiers, used by Alembic. -revision = 'c4d7867d81f5' +revision = '7a71dbf71c64' down_revision = None branch_labels = None depends_on = None diff --git a/lib/models.py b/lib/models.py index 8bc917b0c..2681bee5a 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,9 +1,13 @@ -#!/usr/bin/env python3 - -from sqlalchemy import (Column, String, Integer) +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base -Base = declarative_base() +convention = { + "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", +} +metadata = MetaData(naming_convention=convention) + +Base = declarative_base(metadata=metadata) class Company(Base): __tablename__ = 'companies' From 0a2a67638c9373d251d438f35d166602da48f6fd Mon Sep 17 00:00:00 2001 From: Liz Burton Date: Fri, 17 Nov 2023 15:59:33 -0500 Subject: [PATCH 4/4] AUTO: replace github workflow --- ...vas-sync-codegrade.yml => canvas-sync-ruby-update.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{canvas-sync-codegrade.yml => canvas-sync-ruby-update.yml} (80%) diff --git a/.github/workflows/canvas-sync-codegrade.yml b/.github/workflows/canvas-sync-ruby-update.yml similarity index 80% rename from .github/workflows/canvas-sync-codegrade.yml rename to .github/workflows/canvas-sync-ruby-update.yml index baacfa810..f8818dc0c 100644 --- a/.github/workflows/canvas-sync-codegrade.yml +++ b/.github/workflows/canvas-sync-ruby-update.yml @@ -1,10 +1,10 @@ -name: Sync with Canvas CodeGrade +name: Sync with Canvas Ruby v2.7 on: push: branches: [master, main] paths: - - "README.md" + - 'README.md' jobs: sync: @@ -18,14 +18,14 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 2.7 - name: Install github-to-canvas run: gem install github-to-canvas # Secret stored in learn-co-curriculum Settings/Secrets - name: Sync from .canvas file - run: github-to-canvas -a -lr --contains-html + run: github-to-canvas -a -lr env: CANVAS_API_KEY: ${{ secrets.CANVAS_API_KEY }} CANVAS_API_PATH: ${{ secrets.CANVAS_API_PATH }}