From 0a6d9a7bbd4c63a3c121c52436428eb513c00429 Mon Sep 17 00:00:00 2001 From: George Hotz Date: Tue, 28 Apr 2020 15:23:31 -0700 Subject: [PATCH] remove unused overpy, bump ubuntu_setup to 3.8.2 --- Pipfile | 1 - Pipfile.lock | 72 +++++++++++++++++++++---------------------- tools/ubuntu_setup.sh | 6 ++-- 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Pipfile b/Pipfile index a77610f17..cccc7fc25 100644 --- a/Pipfile +++ b/Pipfile @@ -73,7 +73,6 @@ scikit-image = "*" pygame = "==2.0.0.dev6" [packages] -overpy = {git = "https://github.com/commaai/python-overpy.git",ref = "f86529af402d4642e1faeb146671c40284007323"} atomicwrites = "*" cffi = "*" crcmod = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 018b30efb..cb5392b0b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "dcdc303f513acb78fc0970779aae8570d435f31d55e5cb5b4897e2ff47001f44" + "sha256": "6e5d948a55f5c2393b0c6e805db99bd80f2dc204a7e651e3ba911a07cf59c4d2" }, "pipfile-spec": 6, "requires": { @@ -26,11 +26,11 @@ }, "atomicwrites": { "hashes": [ - "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", - "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" ], "index": "pypi", - "version": "==1.3.0" + "version": "==1.4.0" }, "certifi": { "hashes": [ @@ -375,11 +375,6 @@ "index": "pypi", "version": "==1.18.3" }, - "overpy": { - "git": "https://github.com/commaai/python-overpy.git", - "ref": "f86529af402d4642e1faeb146671c40284007323", - "version": "==0.4" - }, "pillow": { "hashes": [ "sha256:04766c4930c174b46fd72d450674612ab44cca977ebbcc2dde722c6933290107", @@ -773,11 +768,11 @@ }, "azure-cli-core": { "hashes": [ - "sha256:408f49dd1d9bd92c015bd6446760f5fd0c8fe77f57d95285aa3717bdbe3ee5b5", - "sha256:c90cae0be786017b42a38344f63c0982325b3002c2d4ab87f8a9996ae95777b8" + "sha256:ec9961f7236169fbae8d0898ce95d4ec7c070d9d5fe2041ee1c13c3779389401", + "sha256:f225baa7fcfcbafd941cd6cc2ac11a662ae71604d4d7cdbbe9c7502ea10c6feb" ], "index": "pypi", - "version": "==2.4.0" + "version": "==2.5.0" }, "azure-cli-nspkg": { "hashes": [ @@ -914,18 +909,18 @@ }, "boto3": { "hashes": [ - "sha256:7f8b822e383c0d7656488d3b6fdc3e9c42a56fab3ed1a27c2cbc65876093cb21", - "sha256:84daba6d2f0c8d55477ba0b8196ffa7eb7f79d9099f768ac93eb968955877a3f" + "sha256:39ef75f1351d9dce9542c71602bbe4dbae001df1aa5c75bdacea933d60cc1e7f", + "sha256:d345f2ba820f022ab45627913cb427b1fa56d7c1f8e19312eee20874ba800007" ], "index": "pypi", - "version": "==1.12.47" + "version": "==1.12.48" }, "botocore": { "hashes": [ - "sha256:6c6e9db7a6e420431794faee111923e4627b4920d4d9d8b16e1a578a389b2283", - "sha256:cceeb6d2a1bbbd062ab54552ded5065a12b14e845aa35613fc91fd68312020c0" + "sha256:ef4fa3055421cb95a7bf559e715f8c5f656aca30fafef070eca21b13ca3f0f81", + "sha256:f3569216d2f0067a34608e26ae1d0035b84fa29ad68d6c5fd26124a4cc86e8c9" ], - "version": "==1.15.47" + "version": "==1.15.48" }, "cachetools": { "hashes": [ @@ -1524,10 +1519,10 @@ }, "knack": { "hashes": [ - "sha256:101bb40016d05cd63538bf2d203c2096bcd5977e430c7699542425ca5c52a032", - "sha256:27174c101ffce59c6baf6f71b19f97756d504b810777878cc2bc803254f15fd5" + "sha256:4063e504db33d62e4fff00ccb0fb9563bdde6232a27764e07087db75f7de7830", + "sha256:66d1ff609ecfa1da48f731c9258f03d5dd1da324e2cf81732c78e993afc46683" ], - "version": "==0.7.0rc3" + "version": "==0.7.0rc4" }, "lazy-object-proxy": { "hashes": [ @@ -1666,6 +1661,20 @@ "index": "pypi", "version": "==0.3" }, + "msal": { + "hashes": [ + "sha256:c944b833bf686dfbc973e9affdef94b77e616cb52ab397e76cde82e26b8a3373", + "sha256:ecbe3f5ac77facad16abf08eb9d8562af3bc7184be5d4d90c9ef4db5bde26340" + ], + "version": "==1.0.0" + }, + "msal-extensions": { + "hashes": [ + "sha256:59e171a9a4baacdbf001c66915efeaef372fb424421f1a4397115a3ddd6205dc", + "sha256:c5a32b8e1dce1c67733dcdf8aa8bebcff5ab123e779ef7bc14e416bd0da90037" + ], + "version": "==0.1.3" + }, "msgpack-python": { "hashes": [ "sha256:378cc8a6d3545b532dfd149da715abae4fda2a3adb6d74e525d0d5e51f46909b" @@ -1999,19 +2008,8 @@ }, "pyasn1": { "hashes": [ - "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359", - "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576", - "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf", - "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7", "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d", - "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00", - "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8", - "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86", - "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12", - "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776", - "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba", - "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2", - "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3" + "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba" ], "version": "==0.4.8" }, @@ -2037,7 +2035,7 @@ "git": "https://github.com/cocodataset/cocoapi.git", "ref": "8c9bcc3cf640524c4c20a9c40e89cb6a2f2fa0e9", "subdirectory": "PythonAPI", - "version": "==0.0.0" + "version": "==2.0" }, "pycparser": { "hashes": [ @@ -2368,10 +2366,10 @@ }, "pytz": { "hashes": [ - "sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d", - "sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" + "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed", + "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" ], - "version": "==2019.3" + "version": "==2020.1" }, "pywavelets": { "hashes": [ diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh index 561a01945..85bccf7d6 100755 --- a/tools/ubuntu_setup.sh +++ b/tools/ubuntu_setup.sh @@ -69,9 +69,9 @@ git lfs pull git submodule init git submodule update -# install python 3.7.3 globally (you should move to python3 anyway) -pyenv install -s 3.7.3 -pyenv global 3.7.3 +# install python 3.8.2 globally (you should move to python3 anyway) +pyenv install -s 3.8.2 +pyenv global 3.8.2 pyenv rehash # **** in python env ****