From b9c579b135074cdd63549c231e02395dcb371ea1 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Wed, 29 Mar 2023 10:52:31 +0530 Subject: [PATCH 1/5] Fixing the pyqt & version Fixing the pyqt & version --- devops/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 0091132151..f951449559 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -36,7 +36,7 @@ ARG VCS_URL="https://github.com/WildMeOrg/wildbook-ia" ARG VCS_REF="main" -ARG BUILD_DATE="2020" +ARG BUILD_DATE="2023" LABEL autoheal=true @@ -101,8 +101,10 @@ RUN set -ex \ && apt-get remove -y \ python3-pyqt5* \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + qtbase5-dev \ + qtchooser \ qt5-qmake \ - qt5-default \ + qtbase5-dev-tools \ && /virtualenv/env3/bin/pip uninstall -y \ pyqt5 \ && /virtualenv/env3/bin/pip install --upgrade \ From ad0b9acdc7316f8dde0b8bf9331f1287784d4fff Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Wed, 29 Mar 2023 10:55:33 +0530 Subject: [PATCH 2/5] Ubuntu 22 docker + cuda 11.7 upgrade Ubuntu 22 docker + cuda 11.7 upgrade --- devops/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/base/Dockerfile b/devops/base/Dockerfile index b15e140c63..fb30c4debf 100644 --- a/devops/base/Dockerfile +++ b/devops/base/Dockerfile @@ -1,4 +1,4 @@ -ARG WBIA_UBUNTU_IMAGE=nvidia/cuda:11.3.1-cudnn8-runtime-ubuntu20.04 +ARG WBIA_UBUNTU_IMAGE=nvidia/cuda:11.7.0-cudnn8-runtime-ubuntu22.04 FROM ${WBIA_UBUNTU_IMAGE} as org.wildme.wbia.base From 9e92d54e881dc486876bfca99ed2e7a9992641eb Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Wed, 29 Mar 2023 10:59:02 +0530 Subject: [PATCH 3/5] torch version 1.13.1 upgrade Torch version 1.13.1 upgrade and flask OAuthlib version upgrade to fix the following error 'OAuth2Provider' object has no attribute 'invalid_response' --- requirements/runtime.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index bc7f3f1458..1b23a67317 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -16,7 +16,7 @@ docker==6.0.0 Flask-Caching==2.0.1 Flask-CAS==1.0.2 Flask-Cors==3.0.10 -Flask-Login==0.5.0 +Flask-Login==0.9.6 # flask-marshmallow==0.7.0 Flask-Minify==0.39 Flask-OAuthlib==0.5.0 @@ -74,9 +74,9 @@ sqlalchemy==1.4.14 SQLAlchemy-Utils==0.38.3 tensorboard_logger==0.1.0 Theano==1.0.5 -torch==1.12.1 -torchvision==0.13.1 -torchaudio==0.12.1 +torch==1.13.1 +torchvision==0.14.1 +torchaudio==0.13.1 tornado==6.2 tqdm==4.64.0 ubelt==1.2.1 From ab7f5ab3b6e63a1ff53ff7929da4fbf3d4d2af36 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Wed, 29 Mar 2023 11:01:05 +0530 Subject: [PATCH 4/5] fix rebase issue fix rebase issue --- devops/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/Dockerfile b/devops/Dockerfile index f951449559..9121835a26 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ && git pull \ && cd /wbia/wildbook-ia/ \ && git reset --hard origin/main \ + && git config pull.rebase true \ && git pull ########################################################################################## From 091a3657937ff0e7e8bffdd55177ebaf7af1271e Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Wed, 29 Mar 2023 11:08:10 +0530 Subject: [PATCH 5/5] Fix flask OAuth Fix flask OAuth --- requirements/runtime.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 1b23a67317..83434691af 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -16,10 +16,10 @@ docker==6.0.0 Flask-Caching==2.0.1 Flask-CAS==1.0.2 Flask-Cors==3.0.10 -Flask-Login==0.9.6 +Flask-Login==0.5.0 # flask-marshmallow==0.7.0 Flask-Minify==0.39 -Flask-OAuthlib==0.5.0 +Flask-OAuthlib==0.9.6 Flask-Paranoid==0.3.0 flask-restx==1.1.0 # Flask-SQLAlchemy==2.5.0