more merge fixes

biocore · Jul 18, 2020 · d93ecc2 · d93ecc2
1 parent 8713519
commit d93ecc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/microsetta_private_api/admin/admin_impl.py b/microsetta_private_api/admin/admin_impl.py
@@ -1,6 +1,4 @@
 import uuid
-
-import flask
 from flask import jsonify
 import datetime
 

diff --git a/microsetta_private_api/api/tests/test_admin_api.py b/microsetta_private_api/api/tests/test_admin_api.py
@@ -8,10 +8,7 @@
 from microsetta_private_api.repo.admin_repo import AdminRepo
 from microsetta_private_api.api.tests.test_api import client, MOCK_HEADERS, \
     ACCT_ID_1, ACCT_MOCK_ISS, ACCT_MOCK_SUB, \
-    extract_last_id_from_location_header  # noqa
-from microsetta_private_api.api.tests.test_api import client  # noqa Screw you flake8, we use this by name.
-from microsetta_private_api.api.tests.test_api import MOCK_HEADERS, \
-    ACCT_ID_1, ACCT_MOCK_ISS, ACCT_MOCK_SUB
+    extract_last_id_from_location_header  # noqa "client" IS used, by name
 
 DUMMY_PROJ_NAME = "test project"