Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pip versions #292

Merged
merged 5 commits into from
Aug 6, 2020
Merged

Update pip versions #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
280ced8
fix ci tests for 2020.3
dtrawins Aug 4, 2020
12327be
fix pip conflicts
dtrawins Aug 5, 2020
fb8f711
Merge remote-tracking branch 'origin' into update-pip-versions
dtrawins Aug 5, 2020
35aa081
fix more versions
dtrawins Aug 6, 2020
96972d7
review changes
dtrawins Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile_binary_openvino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down