From 8c397c544a2d40b468a3cb959b5c8c35f15f6db1 Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Fri, 26 Feb 2021 14:34:31 +0300 Subject: [PATCH] fixed version numpy version mismatch (#2842) --- Dockerfile | 2 +- cvat/requirements/base.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c38ec5d35fb..3952cc14dac3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN curl -sL https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 --outp # Install requirements RUN python3 -m venv /opt/venv ENV PATH="/opt/venv/bin:${PATH}" -RUN python3 -m pip install --no-cache-dir -U pip==20.0.1 setuptools==49.6.0 wheel==0.35.1 +RUN python3 -m pip install --no-cache-dir -U pip==21.0.1 setuptools==53.0.0 wheel==0.36.2 COPY cvat/requirements/ /tmp/requirements/ RUN DATUMARO_HEADLESS=1 python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index 89675b73508d..c8a6bda47911 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -7,7 +7,7 @@ django-compressor==2.4 django-rq==2.3.2 EasyProcess==0.3 Pillow==7.2.0 -numpy==1.20.0 +numpy==1.19.5 python-ldap==3.3.1 pytz==2020.1 pyunpack==0.2.1 @@ -45,4 +45,5 @@ tensorflow==2.4.1 # Optional requirement of Datumaro patool==1.12 diskcache==5.0.2 open3d==0.11.2 -datumaro==0.1.5.1 --no-binary=datumaro +# workaround for binary incompatibility with numpy when pycocotools is installed by wheel +datumaro==0.1.5.1 --no-binary=datumaro --no-binary=pycocotools