diff --git a/Dockerfile b/Dockerfile index 6a5fe9043c..5bcecea6a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ WORKDIR /ie-serving-py COPY requirements.txt /ie-serving-py/ ENV WRAPT_INSTALL_EXTENSIONS=false RUN virtualenv -p python3 .venv && \ - . .venv/bin/activate && pip3 --no-cache-dir install -r requirements.txt + . .venv/bin/activate && pip3 install --upgrade pip==20.2.1 && \ + pip3 --no-cache-dir install -r requirements.txt --use-feature=2020-resolver COPY start_server.sh setup.py version /ie-serving-py/ COPY ie_serving /ie-serving-py/ie_serving diff --git a/Dockerfile_binary_openvino b/Dockerfile_binary_openvino index a2d7114cbc..e6481477d3 100644 --- a/Dockerfile_binary_openvino +++ b/Dockerfile_binary_openvino @@ -55,7 +55,9 @@ WORKDIR /ie-serving-py COPY start_server.sh setup.py version requirements.txt /ie-serving-py/ ENV WRAPT_INSTALL_EXTENSIONS=false -RUN virtualenv -p python3 .venv && . .venv/bin/activate && pip3 install -r requirements.txt +RUN virtualenv -p python3 .venv && . .venv/bin/activate && \ + pip3 install --upgrade pip==20.2.1 && \ + pip3 install -r requirements.txt --use-feature=2020-resolver COPY ie_serving /ie-serving-py/ie_serving diff --git a/Makefile b/Makefile index 1846ac708d..7a8c529675 100644 --- a/Makefile +++ b/Makefile @@ -48,10 +48,10 @@ venv: $(ACTIVATE) $(ACTIVATE): requirements.txt requirements-dev.txt @echo "Updating virtualenv dependencies in: $(VIRTUALENV_DIR)..." @test -d $(VIRTUALENV_DIR) || $(VIRTUALENV_EXE) $(VIRTUALENV_DIR) - @. $(ACTIVATE); pip$(PY_VERSION) install --upgrade pip + @. $(ACTIVATE); pip$(PY_VERSION) install --upgrade pip==20.2.1 @. $(ACTIVATE); pip$(PY_VERSION) install -vUqq setuptools - @. $(ACTIVATE); pip$(PY_VERSION) install -qq -r requirements.txt - @. $(ACTIVATE); pip$(PY_VERSION) install -qq -r requirements-dev.txt + @. $(ACTIVATE); pip$(PY_VERSION) install -qq -r requirements.txt --use-feature=2020-resolver + @. $(ACTIVATE); pip$(PY_VERSION) install -qq -r requirements-dev.txt --use-feature=2020-resolver @touch $(ACTIVATE) install: $(ACTIVATE) diff --git a/requirements-dev.txt b/requirements-dev.txt index 080c3619db..8be0b12a2f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,8 +2,7 @@ flake8==3.5.0 pytest==3.7.2 pytest-cov==2.5.1 pytest-mock==1.10.0 -requests==2.19.1 -grpcio-testing==1.22.0 +requests==2.21.0 +grpcio-testing==1.24.3 docker==3.7.0 -protobuf==3.6.1 opencv-python==4.1.2.30 diff --git a/requirements.txt b/requirements.txt index 00fee9ee05..eff88679f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ grpcio==1.24.3 -protobuf==3.10.0 +protobuf==3.12.0 tensorflow-serving-api==2.0.* google-cloud-storage==1.20.0 boto3==1.10.2