diff --git a/poetry.lock b/poetry.lock index 2d48511f65..6f1ec37d8e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21c5c5a18e0af76c6e96cdd9dc8aab02c62ea7741831081f1d73ee66572f2376 -size 563078 +oid sha256:f001cc546693d59937130ed9cd49da4bd092d5ec7d1bf96b0419d76ab0271cf7 +size 562441 diff --git a/pyproject.toml b/pyproject.toml index d26fc7ff1d..a20868d877 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ documentation = "https://docs.comma.ai" [tool.poetry.dependencies] python = "~3.8" atomicwrites = "^1.4.0" -casadi = { version = "==3.5.5", markers = "platform_system != 'Darwin'" } +casadi = { version = "==3.5.5", platform = "linux" } cffi = "^1.15.1" crcmod = "^1.7" cryptography = "^37.0.4" @@ -29,7 +29,7 @@ libusb1 = "^3.0.0" nose = "^1.3.7" numpy = "^1.23.0" onnx = "^1.12.0" -onnxruntime-gpu = { version = "^1.11.1", markers = "platform_system != 'Darwin'" } +onnxruntime-gpu = { version = "^1.11.1", platform = "linux" } pillow = "^9.2.0" poetry = "==1.2.2" protobuf = "==3.20.1" @@ -50,20 +50,20 @@ setproctitle = "^1.2.3" six = "^1.16.0" smbus2 = "^0.4.2" sounddevice = "^0.4.5" +spidev = { version = "^3.6", platform = "linux" } sympy = "^1.10.1" timezonefinder = "^6.0.1" tqdm = "^4.64.0" urllib3 = "^1.26.10" utm = "^0.7.0" websocket_client = "^1.3.3" -spidev = "^3.6" [tool.poetry.group.dev.dependencies] av = "^9.2.0" azure-storage-blob = "~2.1" breathe = "^4.34.0" -carla = "==0.9.13" +carla = { version = "==0.9.13", platform = "linux" } control = "^0.9.2" coverage = "^6.4.1" dictdiffer = "^0.9.0" @@ -81,7 +81,7 @@ mypy = "^0.961" myst-parser = "^0.18.0" natsort = "^8.1.0" numpy = "^1.23.0" -opencv-python-headless = { url = "https://github.com/commaai/opencv-python-builder/releases/download/4.5.5.64%2Bcu113/opencv_python_headless-4.5.5.64-cp38-cp38-manylinux_2_31_x86_64.whl" } +opencv-python-headless = { url = "https://github.com/commaai/opencv-python-builder/releases/download/4.5.5.64%2Bcu113/opencv_python_headless-4.5.5.64-cp38-cp38-manylinux_2_31_x86_64.whl", platform = "linux" } pandas = "^1.4.3" parameterized = "^0.8.1" paramiko = "^2.11.0" @@ -119,7 +119,6 @@ azure-cli-core = "^2.38.0" azure-common = "^1.1.28" azure-core = "^1.24.2" azure-nspkg = "~3.0" -azure-storage-blob = "~2.1" azure-storage-common = "~2.1" azure-storage-nspkg = "~3.1" blosc = "==1.9.2" @@ -143,15 +142,12 @@ jupyter = "^1.0.0" jupyterlab = "^3.4.4" jupyterlab-vim = "^0.15.1" Markdown = "^3.4.1" -mpld3 = "^0.5.8" msgpack-python = "^0.5.6" networkx = "~2.3" nvidia-ml-py3 = "^7.352.0" onnx2torch = "^1.5.4" onnxoptimizer = "^0.3.1" -opencv-python-headless = { url = "https://github.com/commaai/opencv-python-builder/releases/download/4.5.5.64%2Bcu113/opencv_python_headless-4.5.5.64-cp38-cp38-manylinux_2_31_x86_64.whl" } osmium = "^3.3.0" -pandas = "^1.4.3" pillow-avif-plugin = "^1.2.2" pipenv = "==2022.10.12" plotly = "^5.9.0" diff --git a/update_requirements.sh b/update_requirements.sh index 9195799ca3..e5dedea7a6 100755 --- a/update_requirements.sh +++ b/update_requirements.sh @@ -45,7 +45,7 @@ fi eval "$(pyenv init --path)" echo "update pip" -pip install pip==22.3 +pip install pip==22.3.1 pip install poetry==1.2.2 poetry config virtualenvs.prefer-active-python true --local