diff --git a/backend/Pipfile b/backend/Pipfile index 182c8baa483e71ae960e68db6e5e55723c104684..d3b34e692fa23e4a63795d66013b4ae6f615adeb 100644 --- a/backend/Pipfile +++ b/backend/Pipfile @@ -56,9 +56,9 @@ metagenedb = {editable = true,path = "."} drf-yasg = "*" packaging = "*" python-slugify = "*" -master = {git = "https://github.com/khillion/bioapi.git"} marshmallow = "*" django-pandas = "*" +bioapi = {editable = true,git = "https://github.com/khillion/bioapi.git"} [requires] python_version = "3.7" diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock index 46cc1ba640c4cacb563a477e93423d75c5e30533..b8aca1df8c6f4d097a72558e3eb56b79b9f8d4ee 100644 --- a/backend/Pipfile.lock +++ b/backend/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4be3394e3c4abe5fc7b75328ef912eaba09e15365322b7493e256f2def2ff013" + "sha256": "20d46b3f68770c9ef62b0f48eaa4648b5731d357d407f5cdc039a398fdd68654" }, "pipfile-spec": 6, "requires": { @@ -16,13 +16,25 @@ ] }, "default": { + "asgiref": { + "hashes": [ + "sha256:7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0", + "sha256:ea448f92fc35a0ef4b1508f53a04c4670255a3f33d22a81c8fc9c872036adbe5" + ], + "version": "==3.2.3" + }, + "bioapi": { + "editable": true, + "git": "https://github.com/khillion/bioapi.git", + "ref": "8aa8a5e446887a91ada4c6cc63ea06ef2e52123d" + }, "certifi": { "hashes": [ - "sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50", - "sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef" + "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", + "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" ], "index": "pypi", - "version": "==2019.9.11" + "version": "==2019.11.28" }, "chardet": { "hashes": [ @@ -32,6 +44,12 @@ "index": "pypi", "version": "==3.0.4" }, + "colored": { + "hashes": [ + "sha256:2468361d777160498cd6db6c47c41bf67ed1029723c4acabae512bedc021c961" + ], + "version": "==1.4.1" + }, "coreapi": { "hashes": [ "sha256:46145fcc1f7017c076a2ef684969b641d18a2991051fddec9458ad3f78ffc1cb", @@ -48,11 +66,11 @@ }, "django": { "hashes": [ - "sha256:16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86", - "sha256:89c2007ca4fa5b351a51a279eccff298520783b713bf28efb89dfb81c80ea49b" + "sha256:6f857bd4e574442ba35a7172f1397b303167dae964cf18e53db5e85fe248d000", + "sha256:d98c9b6e5eed147bc51f47c014ff6826bd1ab50b166956776ee13db5a58804ae" ], "index": "pypi", - "version": "==2.2.7" + "version": "==3.0" }, "django-cors-headers": { "hashes": [ @@ -180,15 +198,11 @@ }, "marshmallow": { "hashes": [ - "sha256:1a358beb89c2b4d5555272065a9533591a3eb02f1b854f3c4002d88d8f2a1ddb", - "sha256:eb97c42c5928b5720812c9268865fe863d4807bc1a8b48ddd7d5c9e1779a6af0" + "sha256:0ba81b6da4ae69eb229b74b3c741ff13fe04fb899824377b1aff5aaa1a9fd46e", + "sha256:3e53dd9e9358977a3929e45cdbe4a671f9eff53a7d6a23f33ed3eab8c1890d8f" ], "index": "pypi", - "version": "==3.2.2" - }, - "master": { - "git": "https://github.com/khillion/bioapi.git", - "ref": "c01af30f9b60428c0d8d2aeae04e5adf1fadba36" + "version": "==3.3.0" }, "metagenedb": { "editable": true, @@ -396,7 +410,7 @@ "sha256:5b26757dc6f79a3b7dc9fab95359328d5747fcb2409d331ea66d0272b90ab2a0", "sha256:8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" ], - "markers": "platform_system == 'Darwin'", + "markers": "sys_platform == 'darwin'", "version": "==0.1.0" }, "astroid": { @@ -514,10 +528,10 @@ }, "faker": { "hashes": [ - "sha256:48c03580720e0b46538d528b1296e4e5b24a809dcaf33a7dddec719489a9edb8", - "sha256:6327c665c0d8721280b3036d9c9e851c60092bc1f30c8394cc433f8723e2bda5" + "sha256:202ad3b2ec16ae7c51c02904fb838831f8d2899e61bf18db1e91a5a582feab11", + "sha256:92c84a10bec81217d9cb554ee12b3838c8986ce0b5d45f72f769da22e4bb5432" ], - "version": "==2.0.4" + "version": "==3.0.0" }, "flake8": { "hashes": [ @@ -529,11 +543,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26", - "sha256:d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af" + "sha256:3a8b2dfd0a2c6a3636e7c016a7e54ae04b997d30e69d5eacdca7a6c2221a1402", + "sha256:41e688146d000891f32b1669e8573c57e39e5060e7f5f647aa617cd9a9568278" ], "index": "pypi", - "version": "==0.23" + "version": "==1.2.0" }, "inflection": { "hashes": [ @@ -550,11 +564,11 @@ }, "ipython": { "hashes": [ - "sha256:dfd303b270b7b5232b3d08bd30ec6fd685d8a58cabd54055e3d69d8f029f7280", - "sha256:ed7ebe1cba899c1c3ccad6f7f1c2d2369464cc77dba8eebc65e2043e19cda995" + "sha256:c66c7e27239855828a764b1e8fc72c24a6f4498a2637572094a78c5551fb9d51", + "sha256:f186b01b36609e0c5d0de27c7ef8e80c990c70478f8c880863004b3489a9030e" ], "markers": "python_version >= '3.3'", - "version": "==7.9.0" + "version": "==7.10.1" }, "ipython-genutils": { "hashes": [ @@ -755,11 +769,11 @@ }, "more-itertools": { "hashes": [ - "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832", - "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4" + "sha256:b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d", + "sha256:c833ef592a0324bcc6a60e48440da07645063c453880c9477ceb22490aec1564" ], "index": "pypi", - "version": "==7.2.0" + "version": "==8.0.2" }, "nbconvert": { "hashes": [ @@ -874,10 +888,10 @@ }, "pygments": { "hashes": [ - "sha256:83ec6c6133ca6b529b7ff5aa826328fd14b5bb02a58c37f4f06384e96a0f94ab", - "sha256:b7949de3d396836085fea596998b135a22610bbcc4f2abfe9e448e44cbc58388" + "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b", + "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe" ], - "version": "==2.5.1" + "version": "==2.5.2" }, "pylint": { "hashes": [