From f48f359f1f4ed6c43e49242680df9287225f0150 Mon Sep 17 00:00:00 2001 From: Michael Herman Date: Tue, 29 Dec 2020 11:47:59 -0600 Subject: [PATCH 1/2] update requirements --- .python-version | 2 +- Dockerfile | 2 +- LICENSE | 2 +- docker-compose.yml | 2 +- project/client/static/main.js | 6 +++--- requirements.txt | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.python-version b/.python-version index 1981190..6bd1074 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.8.0 +3.9.1 diff --git a/Dockerfile b/Dockerfile index c5b4822..04a5b83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # base image -FROM python:3.8.0-alpine +FROM python:3.9.1-alpine # set working directory RUN mkdir -p /usr/src/app diff --git a/LICENSE b/LICENSE index a59e7e6..14a9bd9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Michael Herman +Copyright (c) 2020 Michael Herman Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docker-compose.yml b/docker-compose.yml index 9a9a9dd..c148a5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.7' +version: '3.8' services: diff --git a/project/client/static/main.js b/project/client/static/main.js index 61c8bdc..f7a60fd 100644 --- a/project/client/static/main.js +++ b/project/client/static/main.js @@ -11,10 +11,10 @@ $('.btn').on('click', function() { method: 'POST' }) .done((res) => { - getStatus(res.data.task_id) + getStatus(res.data.task_id); }) .fail((err) => { - console.log(err) + console.log(err); }); }); @@ -38,6 +38,6 @@ function getStatus(taskID) { }, 1000); }) .fail((err) => { - console.log(err) + console.log(err); }); } diff --git a/requirements.txt b/requirements.txt index c4e71f2..067926a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Flask==1.1.1 +Flask==1.1.2 Flask-Bootstrap==3.3.7.1 -Flask-Testing==0.7.1 -Flask-WTF==0.14.2 +Flask-Testing==0.8.1 +Flask-WTF==0.14.3 redis==3.3.11 rq==1.1.0 From fb4ed9f4eeb408c879b043d9126b753e7614d7dc Mon Sep 17 00:00:00 2001 From: Michael Herman Date: Tue, 29 Dec 2020 12:49:38 -0600 Subject: [PATCH 2/2] updates --- docker-compose.yml | 2 +- manage.py | 2 +- project/dashboard/Dockerfile | 2 +- requirements.txt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c148a5e..8bb74f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: - redis redis: - image: redis:5.0.7-alpine + image: redis:6-alpine dashboard: build: ./project/dashboard diff --git a/manage.py b/manage.py index f58c2b4..4826669 100644 --- a/manage.py +++ b/manage.py @@ -4,8 +4,8 @@ import unittest import redis -from rq import Connection, Worker from flask.cli import FlaskGroup +from rq import Connection, Worker from project.server import create_app diff --git a/project/dashboard/Dockerfile b/project/dashboard/Dockerfile index 2ea03e9..3361104 100644 --- a/project/dashboard/Dockerfile +++ b/project/dashboard/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8.0-alpine +FROM python:3.9.1-alpine RUN pip install rq-dashboard diff --git a/requirements.txt b/requirements.txt index 067926a..b03fff3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ Flask==1.1.2 Flask-Bootstrap==3.3.7.1 Flask-Testing==0.8.1 Flask-WTF==0.14.3 -redis==3.3.11 -rq==1.1.0 +redis==3.5.3 +rq==1.7.0