From 246de546966e91f92ae967a9ddc07bc91bf77aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 21 Oct 2020 17:00:55 +0200 Subject: [PATCH 1/4] make is_public field available via services API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub Sokołowski --- cabot/rest_urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cabot/rest_urls.py b/cabot/rest_urls.py index 35c0a9a68..ded792f35 100644 --- a/cabot/rest_urls.py +++ b/cabot/rest_urls.py @@ -53,6 +53,7 @@ class ViewSet(viewset_class): 'url', 'instances', 'overall_status', + 'is_public', ), )) From 8bc5a00aac1aae6fb57d645924abd2eda75d341d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 15 Sep 2021 18:48:31 +0200 Subject: [PATCH 2/4] Dockerfile: pin pip at 20.4.5 due to Python 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pip 21.0 drops support for Python 2: https://pip.pypa.io/en/stable/news/#v21-0 Signed-off-by: Jakub Sokołowski --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f42761fb1..e5b48a1c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN npm install -g \ coffee-script \ less@1.3 -RUN pip install --upgrade pip +RUN pip install --upgrade pip==20.3.4 COPY requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt From 4461771ebe7d17f9b857c94167a79855a49209dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 15 Sep 2021 19:05:41 +0200 Subject: [PATCH 3/4] Dockerfile: fix cryptography build by upgrading image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also use HTTPS for NPM package registry. Signed-off-by: Jakub Sokołowski --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e5b48a1c2..c3f416308 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:4-alpine +FROM node:12-alpine ENV PYTHONUNBUFFERED 1 @@ -22,8 +22,8 @@ RUN apk add --no-cache \ RUN npm config set unsafe-perm true RUN npm install -g \ - --registry http://registry.npmjs.org/ \ - coffee-script \ + --registry https://registry.npmjs.org/ \ + coffeescript \ less@1.3 RUN pip install --upgrade pip==20.3.4 From cd14ac6bc4c1e5e7f23a803ccc560493decca25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 15 Sep 2021 18:42:59 +0200 Subject: [PATCH 4/4] upgrade social-auth packages to fix GitHub OAuth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/arachnys/cabot/issues/698 Signed-off-by: Jakub Sokołowski --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index dca9d9905..082caec49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,8 +56,8 @@ requests-oauthlib==1.2.0 rjsmin==1.0.12 s3transfer==0.1.13 six==1.10.0 -social-auth-app-django==1.1.0 -social-auth-core==3.0.0 +social-auth-app-django==4.0.0 +social-auth-core==3.4.0 twilio==5.7.0 uritemplate==3.0.0 urllib3==1.24.1