upgrades (#332)

* Heroku ready (#276)

* Get heroku ready

* Add yml file

* Remove unneeded files

* Remove deploy files

* Remove check for services being ready

* Update logs

* Update logging

* Updating tc root

* Logging for photos

* Logging for setting an image

* More logging

* Images to aws

* Remove hash test

* Storing images in s3 and tests

* Adding secrets

* Tests

* Add runtime

* Fix deploy

* Install boto3

* Fix images

* Remove end2end

* upgrades

* lint

* test fix

* print text

* redis url change

* more test prints

* remove prints

* pydantic 1.5.1

* prints just in case A new workflow

* no print

* Remove bad status badge

Co-authored-by: Alex Ford <[email protected]>

Author: tomhamiltonstubber

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: socket_test
         ports:
-        - 5432:5432
+          - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       redis:
         image: redis
@@ -29,7 +29,7 @@ jobs:
         options: --entrypoint redis-server
 
     env:
-      DATABASE_URL: 'postgres://postgres:postgres@localhost:5432/socket_test'
+      DATABASE_URL: 'postgres://postgres:postgres@127.0.0.1:5432/socket_test'
 
     steps:
     - uses: actions/checkout@v2

README.md

@@ -1,7 +1,7 @@
 socket-server
 =============
 
-[![Build Status](https://github.com/tutorcruncher/socket-server/workflows/CI/badge.svg)
+![Build Status](https://github.com/tutorcruncher/socket-server/workflows/CI/badge.svg)
 [![codecov](https://codecov.io/gh/tutorcruncher/socket-server/branch/master/graph/badge.svg)](https://codecov.io/gh/tutorcruncher/socket-server)
 
 Backend application for [TutorCruncher's](https://tutorcruncher.com) web integration.

tcsocket/requirements.txt

@@ -1,17 +1,17 @@
-SQLAlchemy==1.3.17
+SQLAlchemy==1.3.23
 aiodns==2.0.0
-aiohttp==3.6.2
-aiopg==1.0.0
-arq==0.19.0
+aiohttp==3.7.4
+aiopg==1.1.0
+arq==0.19.1
 boto3==1.14.7
-cchardet==2.1.6
+cchardet==2.1.7
 gunicorn==20.0.4
 python-dateutil==2.8.1
-pillow==7.1.2
+pillow==8.1.2
 pydantic[email]==1.5.1
 raven==6.10.0
-uvloop==0.14.0
-ipython==7.15.0
-pgcli==3.0.0
+uvloop==0.15.2
+ipython==7.21.0
+pgcli==3.1.0
 ipython-sql==0.4.0
-yarl==1.4.2
+yarl==1.6.3

tcsocket/run.py

@@ -4,14 +4,13 @@
 from functools import partial
 
 import click
-from arq import run_worker
-from gunicorn.app.base import BaseApplication
-
 from app.logs import setup_logging
 from app.main import create_app
 from app.management import prepare_database, run_patch
 from app.settings import Settings
 from app.worker import WorkerSettings
+from arq import run_worker
+from gunicorn.app.base import BaseApplication
 
 logger = logging.getLogger('socket')
 

tests/requirements.txt

@@ -1,15 +1,15 @@
-black==19.10b0
-attrs==19.3.0
-coverage==5.1
-flake8==3.8.2
-isort==4.3.21
-pycodestyle==2.6.0
-pyflakes==2.2.0
-pytest==5.4.2
+attrs==20.3.0
+black==20.8b1
+coverage==5.5
+flake8==3.9.0
+isort==5.7.0
+pycodestyle==2.7.0
+pyflakes==2.3.0
+pytest==6.2.2
 pytest-aiohttp==0.3.0
-pytest-cov==2.9.0
-pytest-isort==1.0.0
-pytest-mock==3.1.0
-pytest-sugar==0.9.3
+pytest-cov==2.11.1
+pytest-isort==1.3.0
+pytest-mock==3.5.1
+pytest-sugar==0.9.4
 pytest-toolbox==0.4
 requests==2.24.0