Fix docker build error (#101)

Author: katesliang

.dockerignore

@@ -0,0 +1,11 @@
+__pycache__/
+.cache/
+venv/
+
+.envrc
+.env
+*.pyc
+*.db
+*.p8
+gmail_credentials.json
+gmail_token.json

.gitignore

@@ -2,6 +2,7 @@ __pycache__/
 .cache/
 venv/
 
+.env
 .envrc
 *.pyc
 *.db

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app

docker-compose.yml

@@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  coursegrab:
+    build: .
+    env_file: ".env"
+    ports:
+      - "5000:5000"

requirements.txt

@@ -3,14 +3,14 @@ appdirs==1.4.3
 aspy.yaml==1.3.0
 attrs==19.3.0
 beautifulsoup4==4.8.1
-black
+black==20.8b1
 CacheControl==0.12.6
 cachetools==4.0.0
 certifi==2019.9.11
 cffi==1.14.0
 cfgv==2.0.1
 chardet==3.0.4
-Click==7.0
+Click==7.1.2
 cryptography==2.9
 entrypoints==0.3
 firebase-admin==4.0.1
@@ -20,11 +20,6 @@ Flask-Cors==3.0.1
 Flask-Migrate==2.5.2
 Flask-Script==2.0.6
 Flask-SQLAlchemy==2.4.1
-google-api-core==1.26.2
-google-api-python-client==2.0.2
-google-auth==1.28.0
-google-auth-httplib2==0.1.0
-google-auth-oauthlib==0.4.3
 google-cloud-core==1.3.0
 google-cloud-firestore==1.6.2
 google-cloud-storage==1.27.0
@@ -77,12 +72,12 @@ sendgrid==6.1.2
 six==1.13.0
 soupsieve==1.9.5
 SQLAlchemy==1.3.11
-toml==0.10.0
+toml==0.10.1
 typed-ast==1.4.1
 typing-extensions==3.7.4.3
 uritemplate==3.0.1
 urllib3==1.25.6
 virtualenv==16.7.7
 wcwidth==0.1.8
 Werkzeug==0.16.0
-zipp==0.6.0
+zipp==0.6.0

requirements.txt.bak

@@ -0,0 +1,88 @@
+alembic==1.4.1
+appdirs==1.4.3
+aspy.yaml==1.3.0
+attrs==19.3.0
+beautifulsoup4==4.8.1
+black
+CacheControl==0.12.6
+cachetools==4.0.0
+certifi==2019.9.11
+cffi==1.14.0
+cfgv==2.0.1
+chardet==3.0.4
+Click==7.0
+cryptography==2.9
+entrypoints==0.3
+firebase-admin==4.0.1
+flake8==3.7.9
+Flask==1.1.1
+Flask-Cors==3.0.1
+Flask-Migrate==2.5.2
+Flask-Script==2.0.6
+Flask-SQLAlchemy==2.4.1
+google-api-core==1.26.2
+google-api-python-client==2.0.2
+google-auth==1.28.0
+google-auth-httplib2==0.1.0
+google-auth-oauthlib==0.4.3
+google-cloud-core==1.3.0
+google-cloud-firestore==1.6.2
+google-cloud-storage==1.27.0
+google-resumable-media==0.5.0
+googleapis-common-protos==1.51.0
+grpcio==1.28.1
+h2==2.6.2
+hpack==3.0.0
+httplib2==0.18.0
+hyper==0.7.0
+hyperframe==3.2.0
+identify==1.4.7
+idna==2.8
+importlib-metadata==0.23
+importlib-resources==1.0.2
+itsdangerous==1.1.0
+Jinja2==2.10.3
+Mako==1.1.2
+MarkupSafe==1.1.1
+mccabe==0.6.1
+more-itertools==7.2.0
+msgpack==1.0.0
+mypy-extensions==0.4.3
+nodeenv==1.3.3
+oauthlib==3.1.0
+packaging==20.1
+pathspec==0.7.0
+pluggy==0.13.1
+pre-commit==1.20.0
+protobuf==3.15.6
+py==1.8.1
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycodestyle==2.5.0
+pycparser==2.20
+pyflakes==2.1.1
+PyJWT==1.7.1
+pyparsing==2.4.6
+pytest==5.3.5
+python-dateutil==2.8.1
+python-editor==1.0.4
+python-http-client==3.2.5
+pytz==2019.3
+PyYAML==5.1.2
+regex==2020.1.8
+requests==2.22.0
+requests-oauthlib==1.3.0
+rsa==4.0
+sendgrid==6.1.2
+six==1.13.0
+soupsieve==1.9.5
+SQLAlchemy==1.3.11
+toml==0.10.0
+typed-ast==1.4.1
+typing-extensions==3.7.4.3
+uritemplate==3.0.1
+urllib3==1.25.6
+virtualenv==16.7.7
+wcwidth==0.1.8
+Werkzeug==0.16.0
+zipp==0.6.0

src/app/coursegrab/dao/courses_dao.py

@@ -5,6 +5,7 @@
 def get_course_by_id(course_id):
     return Course.query.filter_by(id=course_id).first()
 
+
 def get_course_by_subject_and_course_num(subject_code, course_num):
     return Course.query.filter_by(subject_code=subject_code, course_num=course_num).first()
 
@@ -26,11 +27,13 @@ def search_courses(query):
     results = sorted(results, key = lambda r : find_query_index(r, query))
     return results
 
+
 def find_query_index(course, key):
     try: 
         return course.search_string.lower().index(key.lower()) 
     except(ValueError): 
         return -1
 
+
 def clear_table():
     Course.query.delete()