some lint stuff

Author: tschaume

mpcontribs-api/mpcontribs/api/__init__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """Flask App for MPContribs API"""
 import os
-import urllib
 import smtplib
 import logging
 import requests
@@ -10,7 +9,7 @@
 from email.message import EmailMessage
 from importlib import import_module
 from websocket import create_connection
-from flask import Flask, current_app, request, g, jsonify
+from flask import Flask, current_app, request, jsonify
 from flask_marshmallow import Marshmallow
 from flask_mongoengine import MongoEngine
 from flask_mongorest import register_class
@@ -113,7 +112,7 @@ def send_email(to, subject, html):
     msg["To"] = to
 
     # NOTE boto3 SES client can't connect to VPC endpoint yet
-    with smtplib.SMTP(host=SMTP_HOST, port=SMTP_PORT) as ses_client:
+    with smtplib.SMTP(host=SMTP_HOST, port=int(SMTP_PORT)) as ses_client:
         ses_client.starttls()
         ses_client.login(os.environ["SMTP_USERNAME"], os.environ["SMTP_PASSWORD"])
         ses_client.send_message(msg)
@@ -163,7 +162,7 @@ def get_kernels():
 
     response = r.json()
     nkernels = 3  # reserve 3 kernels for each deployment
-    idx = int(os.environ.get("DEPLOYMENT"))
+    idx = int(os.environ.get("DEPLOYMENT", 1))
 
     if len(response) < nkernels * (idx + 1):
         logger.error("NOT ENOUGH KERNELS AVAILABLE")

mpcontribs-api/mpcontribs/api/projects/views.py

@@ -99,7 +99,7 @@ def has_add_permission(self, req, obj):
 
         # is_approved can only be set by an admin
         if obj.is_approved:
-            raise Unauthorized(f"Only admins can set `is_approved=True`")
+            raise Unauthorized("Only admins can set `is_approved=True`")
 
         # limit the number of projects a user can own (unless admin)
         nr_projects = Projects.objects(owner=obj.owner).count()
@@ -161,11 +161,14 @@ def search():
     if not term:
         abort(404, description="Missing search term.")
 
-    pipeline = [{
-        "$search": {
-            "index": "mpcontribs-dev-project-search",
-            "text": {"path": {"wildcard": "*"}, "query": term}
-        }
-    }, {"$project": {"_id": 1}}]
+    pipeline = [
+        {
+            "$search": {
+                "index": "mpcontribs-dev-project-search",
+                "text": {"path": {"wildcard": "*"}, "query": term},
+            }
+        },
+        {"$project": {"_id": 1}},
+    ]
     result = [p["_id"] for p in Projects.objects().aggregate(pipeline)]
     return jsonify(result)

mpcontribs-api/scripts/start.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 set -e
-zzz=$(($DEPLOYMENT * 60))
+zzz=$((DEPLOYMENT * 60))
 echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..."
 sleep $zzz
 
-pmgrc=$HOME/.pmgrc.yaml
-[[ ! -e $pmgrc ]] && echo "PMG_DUMMY_VAR: dummy" >$pmgrc
+PMGRC=$HOME/.pmgrc.yaml
+[[ ! -e "$PMGRC" ]] && echo "PMG_DUMMY_VAR: dummy" >"$PMGRC"
 
 STATS_ARG=""
 SERVER_APP="mpcontribs.api:create_app()"

mpcontribs-api/scripts/start_rq.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-zzz=$(($DEPLOYMENT * 60))
+zzz=$((DEPLOYMENT * 60))
 echo "$SUPERVISOR_PROCESS_NAME: waiting for $zzz seconds before start..."
 sleep $zzz