Merge pull request #316 from ComputerScienceHouse/develop

Author: mxmeinhold

.dockerignore

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

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/docker-build.yml

@@ -0,0 +1,32 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+
+  # Run tests for any PRs.
+  pull_request:
+    branches:
+      - develop
+      - master
+
+env:
+  IMAGE_NAME: conditional
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run tests
+        run: |
+          if [ -f docker-compose.test.yml ]; then
+            docker-compose --file docker-compose.test.yml build
+            docker-compose --file docker-compose.test.yml run sut
+          else
+            docker build . --file Dockerfile
+          fi

.github/workflows/node-js.yml

@@ -0,0 +1,27 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [develop, master]
+  pull_request:
+    branches: [develop, master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [8.x, 10.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm run production

.github/workflows/python-app.yml

@@ -0,0 +1,34 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master, develop]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [3.8, 3.9]
+
+    steps:
+      - name: Install ldap dependencies
+        run: sudo apt-get install libldap2-dev libsasl2-dev
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+      - name: Lint with pylint
+        run: |
+          pylint conditional

.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,4 +1,4 @@
-FROM python:3.6-stretch
+FROM docker.io/python:3.8-buster
 MAINTAINER Devin Matte <[email protected]>
 
 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 && \

Dockerfile

@@ -8,7 +8,6 @@
 from flask_gzip import Gzip
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
-from raven.contrib.flask import Sentry
 
 import sentry_sdk
 from sentry_sdk.integrations.flask import FlaskIntegration
@@ -30,10 +29,10 @@
 migrate = Migrate(app, db)
 
 # Sentry setup
-sentry = Sentry(app)
 sentry_sdk.init(
     dsn=app.config['SENTRY_DSN'],
-    integrations=[FlaskIntegration(), SqlalchemyIntegration()]
+    integrations=[FlaskIntegration(), SqlalchemyIntegration()],
+    environment=app.config['SENTRY_ENV'],
 )
 
 ldap = CSHLDAP(app.config['LDAP_BIND_DN'],
@@ -190,15 +189,8 @@ def route_errors(error, user_dict=None):
     return render_template('errors.html',
                            error=error_desc,
                            error_code=code,
-                           event_id=g.sentry_event_id,
-                           public_dsn=sentry.client.get_public_dsn('https'),
+                           event_id=sentry_sdk.last_event_id(),
                            **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/__init__.py

@@ -44,7 +44,7 @@ def display_dashboard(user_dict=None):
     if ldap_is_intromember(user_dict['account']):
         data['freshman'] = get_freshman_data(user_dict['account'].uid)
     else:
-        data['freshman'] = False
+        data['freshman'] = None
 
     spring = {}
     c_meetings = get_cm(user_dict['account'])

conditional/blueprints/dashboard.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/housing.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/intro_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: