Merge pull request #264 from ComputerScienceHouse/3.8-build-node-10

Upgrading to python 3.8, nodejs 10.x and fixing docker build

Author: devinmatte

.dockerignore

@@ -0,0 +1,2 @@
+Dockerfile
+.gitignore

.gitignore

@@ -9,6 +9,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
 build/
 develop-eggs/
 dist/

.nvmrc

@@ -1 +1 @@
-6.3.1
+10

.pylintrc

@@ -90,4 +90,4 @@ min-public-methods = 2
 max-public-methods = 20
 
 [EXCEPTIONS]
-overgeneral-exceptions = Exception
+overgeneral-exceptions = Exception

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.6"
+  - "3.8"
 services:
   - "docker"
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-stretch
+FROM python:3.8-buster
 MAINTAINER Devin Matte <matted@csh.rit.edu>
 
 RUN mkdir /opt/conditional
@@ -8,15 +8,15 @@ ADD requirements.txt /opt/conditional
 WORKDIR /opt/conditional
 
 RUN apt-get -yq update && \
-    apt-get -yq install libsasl2-dev libldap2-dev libssl-dev && \
+    apt-get -yq install libsasl2-dev libldap2-dev libssl-dev gcc g++ make && \
     pip install -r requirements.txt && \
     apt-get -yq clean all
 
 ADD . /opt/conditional
 
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
     apt-get -yq update && \
-    apt-get -yq install nodejs npm && \
+    apt-get -yq install nodejs && \
     npm install && \
     npm run production && \
     rm -rf node_modules && \

conditional/__init__.py

@@ -195,10 +195,4 @@ def route_errors(error, user_dict=None):
                            **data), int(code)
 
 
-@app.cli.command()
-def zoo():
-    from conditional.models.migrate import free_the_zoo
-    free_the_zoo(app.config['ZOO_DATABASE_URI'])
-
-
 logger.info('conditional started')

conditional/blueprints/housing.py

@@ -27,7 +27,7 @@ def display_housing(user_dict=None):
     log.info('Display Housing Board')
 
     housing = {}
-    onfloors = [account for account in ldap_get_onfloor_members()]
+    onfloors = ldap_get_onfloor_members()
     onfloor_freshmen = FreshmanAccount.query.filter(
         FreshmanAccount.room_number is not None
     )

conditional/blueprints/intro_evals.py

@@ -37,14 +37,14 @@ def get_fid_cm_count(member_id):
             FreshmanCommitteeAttendance.fid == member_id)
             if CommitteeMeeting.query.filter(CommitteeMeeting.id == a.meeting_id).first().approved])
 
-    members = [account for account in ldap_get_intro_members()]
+    members = ldap_get_intro_members()
 
     ie_members = []
 
     # freshmen who don't have accounts
-    fids = [f for f in FreshmanAccount.query.filter(
+    fids = list(FreshmanAccount.query.filter(
         FreshmanAccount.eval_date > start_of_year(),
-        FreshmanAccount.eval_date > datetime.now())]
+        FreshmanAccount.eval_date > datetime.now()))
 
     for fid in fids:
         h_meetings = [m.meeting_id for m in
@@ -104,7 +104,7 @@ def get_fid_cm_count(member_id):
 
         if freshman_data is None:
             continue
-        elif freshman_data.freshman_eval_result != "Pending" and internal:
+        if freshman_data.freshman_eval_result != "Pending" and internal:
             continue
 
         h_meetings = [m.meeting_id for m in get_hm(member, only_absent=True)]

conditional/blueprints/spring_evals.py

@@ -23,7 +23,7 @@ def display_spring_evals(internal=False, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Membership Evaluations Listing')
 
-    active_members = [account for account in ldap_get_active_members()]
+    active_members = ldap_get_active_members()
 
     sp_members = []
     for account in active_members: