format tests

Author: A-Baji

.github/workflows/development.yaml

@@ -50,3 +50,4 @@ jobs:
           flake8 --ignore=E203,E722,F401,W503 datajoint \
                  --count --max-complexity=62 --max-line-length=127 --statistics
           black datajoint --check -v
+          black tests --check -v

tests/__init__.py

@@ -17,150 +17,175 @@
 import shutil
 from datajoint.utils import parse_sql
 
-__author__ = 'Edgar Walker, Fabian Sinz, Dimitri Yatsenko, Raphael Guzman'
+__author__ = "Edgar Walker, Fabian Sinz, Dimitri Yatsenko, Raphael Guzman"
 
 # turn on verbose logging
 logging.basicConfig(level=logging.DEBUG)
 
-__all__ = ['__author__', 'PREFIX', 'CONN_INFO']
+__all__ = ["__author__", "PREFIX", "CONN_INFO"]
 
 # Connection for testing
 CONN_INFO = dict(
-    host=environ.get('DJ_TEST_HOST', 'fakeservices.datajoint.io'),
-    user=environ.get('DJ_TEST_USER', 'datajoint'),
-    password=environ.get('DJ_TEST_PASSWORD', 'datajoint'))
+    host=environ.get("DJ_TEST_HOST", "fakeservices.datajoint.io"),
+    user=environ.get("DJ_TEST_USER", "datajoint"),
+    password=environ.get("DJ_TEST_PASSWORD", "datajoint"),
+)
 
 CONN_INFO_ROOT = dict(
-    host=environ.get('DJ_HOST', 'fakeservices.datajoint.io'),
-    user=environ.get('DJ_USER', 'root'),
-    password=environ.get('DJ_PASS', 'simple'))
+    host=environ.get("DJ_HOST", "fakeservices.datajoint.io"),
+    user=environ.get("DJ_USER", "root"),
+    password=environ.get("DJ_PASS", "simple"),
+)
 
 S3_CONN_INFO = dict(
-    endpoint=environ.get('S3_ENDPOINT', 'fakeservices.datajoint.io'),
-    access_key=environ.get('S3_ACCESS_KEY', 'datajoint'),
-    secret_key=environ.get('S3_SECRET_KEY', 'datajoint'),
-    bucket=environ.get('S3_BUCKET', 'datajoint.test'))
-
-S3_MIGRATE_BUCKET = [path.name for path in Path(
-        Path(__file__).resolve().parent,
-        'external-legacy-data', 's3').iterdir()][0]
+    endpoint=environ.get("S3_ENDPOINT", "fakeservices.datajoint.io"),
+    access_key=environ.get("S3_ACCESS_KEY", "datajoint"),
+    secret_key=environ.get("S3_SECRET_KEY", "datajoint"),
+    bucket=environ.get("S3_BUCKET", "datajoint.test"),
+)
+
+S3_MIGRATE_BUCKET = [
+    path.name
+    for path in Path(
+        Path(__file__).resolve().parent, "external-legacy-data", "s3"
+    ).iterdir()
+][0]
 
 # Prefix for all databases used during testing
-PREFIX = environ.get('DJ_TEST_DB_PREFIX', 'djtest')
+PREFIX = environ.get("DJ_TEST_DB_PREFIX", "djtest")
 conn_root = dj.conn(**CONN_INFO_ROOT)
 
 # Initialize httpClient with relevant timeout.
 httpClient = urllib3.PoolManager(
-            timeout=30,
-            cert_reqs='CERT_REQUIRED',
-            ca_certs=certifi.where(),
-            retries=urllib3.Retry(
-                total=3,
-                backoff_factor=0.2,
-                status_forcelist=[500, 502, 503, 504]
-            )
-        )
+    timeout=30,
+    cert_reqs="CERT_REQUIRED",
+    ca_certs=certifi.where(),
+    retries=urllib3.Retry(
+        total=3, backoff_factor=0.2, status_forcelist=[500, 502, 503, 504]
+    ),
+)
 
 # Initialize minioClient with an endpoint and access/secret keys.
 minioClient = minio.Minio(
-    S3_CONN_INFO['endpoint'],
-    access_key=S3_CONN_INFO['access_key'],
-    secret_key=S3_CONN_INFO['secret_key'],
+    S3_CONN_INFO["endpoint"],
+    access_key=S3_CONN_INFO["access_key"],
+    secret_key=S3_CONN_INFO["secret_key"],
     secure=True,
-    http_client=httpClient)
+    http_client=httpClient,
+)
 
 
 def setup_package():
     """
     Package-level unit test setup
     Turns off safemode
     """
-    dj.config['safemode'] = False
+    dj.config["safemode"] = False
 
     # Create MySQL users
-    if LooseVersion(conn_root.query(
-            "select @@version;").fetchone()[0]) >= LooseVersion('8.0.0'):
+    if LooseVersion(conn_root.query("select @@version;").fetchone()[0]) >= LooseVersion(
+        "8.0.0"
+    ):
         # create user if necessary on mysql8
-        conn_root.query("""
+        conn_root.query(
+            """
                 CREATE USER IF NOT EXISTS 'datajoint'@'%%'
                 IDENTIFIED BY 'datajoint';
-                """)
-        conn_root.query("""
+                """
+        )
+        conn_root.query(
+            """
                 CREATE USER IF NOT EXISTS 'djview'@'%%'
                 IDENTIFIED BY 'djview';
-                """)
-        conn_root.query("""
+                """
+        )
+        conn_root.query(
+            """
                 CREATE USER IF NOT EXISTS 'djssl'@'%%'
                 IDENTIFIED BY 'djssl'
                 REQUIRE SSL;
-                """)
-        conn_root.query(
-            "GRANT ALL PRIVILEGES ON `djtest%%`.* TO 'datajoint'@'%%';")
-        conn_root.query(
-            "GRANT SELECT ON `djtest%%`.* TO 'djview'@'%%';")
-        conn_root.query(
-            "GRANT SELECT ON `djtest%%`.* TO 'djssl'@'%%';")
+                """
+        )
+        conn_root.query("GRANT ALL PRIVILEGES ON `djtest%%`.* TO 'datajoint'@'%%';")
+        conn_root.query("GRANT SELECT ON `djtest%%`.* TO 'djview'@'%%';")
+        conn_root.query("GRANT SELECT ON `djtest%%`.* TO 'djssl'@'%%';")
     else:
         # grant permissions. For MySQL 5.7 this also automatically creates user
         # if not exists
-        conn_root.query("""
+        conn_root.query(
+            """
             GRANT ALL PRIVILEGES ON `djtest%%`.* TO 'datajoint'@'%%'
             IDENTIFIED BY 'datajoint';
-            """)
+            """
+        )
         conn_root.query(
             "GRANT SELECT ON `djtest%%`.* TO 'djview'@'%%' IDENTIFIED BY 'djview';"
-            )
-        conn_root.query("""
+        )
+        conn_root.query(
+            """
             GRANT SELECT ON `djtest%%`.* TO 'djssl'@'%%'
             IDENTIFIED BY 'djssl'
             REQUIRE SSL;
-            """)
+            """
+        )
 
     # Add old MySQL
-    source = Path(
-        Path(__file__).resolve().parent,
-        'external-legacy-data')
+    source = Path(Path(__file__).resolve().parent, "external-legacy-data")
     db_name = "djtest_blob_migrate"
     db_file = "v0_11.sql"
-    conn_root.query("""
+    conn_root.query(
+        """
         CREATE DATABASE IF NOT EXISTS {};
-        """.format(db_name))
+        """.format(
+            db_name
+        )
+    )
 
-    statements = parse_sql(Path(source,db_file))
+    statements = parse_sql(Path(source, db_file))
     for s in statements:
         conn_root.query(s)
 
     # Add old S3
-    source = Path(
-        Path(__file__).resolve().parent,
-        'external-legacy-data', 's3')
+    source = Path(Path(__file__).resolve().parent, "external-legacy-data", "s3")
     region = "us-east-1"
     try:
         minioClient.make_bucket(S3_MIGRATE_BUCKET, location=region)
     except minio.error.S3Error as e:
-        if e.code != 'BucketAlreadyOwnedByYou':
+        if e.code != "BucketAlreadyOwnedByYou":
             raise e
 
-    pathlist = Path(source).glob('**/*')
+    pathlist = Path(source).glob("**/*")
     for path in pathlist:
         if os.path.isfile(str(path)) and ".sql" not in str(path):
             minioClient.fput_object(
-                    S3_MIGRATE_BUCKET, str(Path(
-                        os.path.relpath(str(path), str(Path(source, S3_MIGRATE_BUCKET))))
-                                .as_posix()), str(path))
+                S3_MIGRATE_BUCKET,
+                str(
+                    Path(
+                        os.path.relpath(str(path), str(Path(source, S3_MIGRATE_BUCKET)))
+                    ).as_posix()
+                ),
+                str(path),
+            )
     # Add S3
     try:
-        minioClient.make_bucket(S3_CONN_INFO['bucket'], location=region)
+        minioClient.make_bucket(S3_CONN_INFO["bucket"], location=region)
     except minio.error.S3Error as e:
-        if e.code != 'BucketAlreadyOwnedByYou':
+        if e.code != "BucketAlreadyOwnedByYou":
             raise e
 
     # Add old File Content
     try:
         shutil.copytree(
-            str(Path(Path(__file__).resolve().parent,
-            'external-legacy-data','file','temp')),
-            str(Path(os.path.expanduser('~'),'temp')))
+            str(
+                Path(
+                    Path(__file__).resolve().parent,
+                    "external-legacy-data",
+                    "file",
+                    "temp",
+                )
+            ),
+            str(Path(os.path.expanduser("~"), "temp")),
+        )
     except FileExistsError:
         pass
 
@@ -172,31 +197,34 @@ def teardown_package():
     To deal with possible foreign key constraints, it will unset
     and then later reset FOREIGN_KEY_CHECKS flag
     """
-    conn_root.query('SET FOREIGN_KEY_CHECKS=0')
+    conn_root.query("SET FOREIGN_KEY_CHECKS=0")
     cur = conn_root.query('SHOW DATABASES LIKE "{}\_%%"'.format(PREFIX))
     for db in cur.fetchall():
-        conn_root.query('DROP DATABASE `{}`'.format(db[0]))
-    conn_root.query('SET FOREIGN_KEY_CHECKS=1')
+        conn_root.query("DROP DATABASE `{}`".format(db[0]))
+    conn_root.query("SET FOREIGN_KEY_CHECKS=1")
     if os.path.exists("dj_local_conf.json"):
         remove("dj_local_conf.json")
 
     # Remove created users
-    conn_root.query('DROP USER `datajoint`')
-    conn_root.query('DROP USER `djview`')
-    conn_root.query('DROP USER `djssl`')
+    conn_root.query("DROP USER `datajoint`")
+    conn_root.query("DROP USER `djview`")
+    conn_root.query("DROP USER `djssl`")
 
     # Remove old S3
-    objs = list(minioClient.list_objects(
-            S3_MIGRATE_BUCKET, recursive=True))
-    objs = [minioClient.remove_object(S3_MIGRATE_BUCKET,
-            o.object_name.encode('utf-8')) for o in objs]
+    objs = list(minioClient.list_objects(S3_MIGRATE_BUCKET, recursive=True))
+    objs = [
+        minioClient.remove_object(S3_MIGRATE_BUCKET, o.object_name.encode("utf-8"))
+        for o in objs
+    ]
     minioClient.remove_bucket(S3_MIGRATE_BUCKET)
 
     # Remove S3
-    objs = list(minioClient.list_objects(S3_CONN_INFO['bucket'], recursive=True))
-    objs = [minioClient.remove_object(S3_CONN_INFO['bucket'],
-            o.object_name.encode('utf-8')) for o in objs]
-    minioClient.remove_bucket(S3_CONN_INFO['bucket'])
+    objs = list(minioClient.list_objects(S3_CONN_INFO["bucket"], recursive=True))
+    objs = [
+        minioClient.remove_object(S3_CONN_INFO["bucket"], o.object_name.encode("utf-8"))
+        for o in objs
+    ]
+    minioClient.remove_bucket(S3_CONN_INFO["bucket"])
 
     # Remove old File Content
-    shutil.rmtree(str(Path(os.path.expanduser('~'),'temp')))
+    shutil.rmtree(str(Path(os.path.expanduser("~"), "temp")))