From cb9a1189bc479cda43bde836f29eb195021d2289 Mon Sep 17 00:00:00 2001 From: Dominykas Mostauskis Date: Mon, 28 Feb 2022 18:56:10 +0200 Subject: [PATCH] Linter fixes --- mathesar/tests/conftest.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mathesar/tests/conftest.py b/mathesar/tests/conftest.py index 06a7e19461..7c590b013d 100644 --- a/mathesar/tests/conftest.py +++ b/mathesar/tests/conftest.py @@ -1,16 +1,9 @@ -from django.core.files import File """ This inherits the fixtures in the root conftest.py """ import pytest -from sqlalchemy import text - -from db.schemas.operations.create import create_schema as create_sa_schema -from db.schemas.utils import get_schema_oid_from_name, get_schema_name_from_oid -from mathesar.imports.csv import create_table_from_csv -from mathesar.models import Database -from mathesar.models import Schema, DataFile +from django.core.files import File from sqlalchemy import Column, MetaData, text, Integer from sqlalchemy import Table as SATable @@ -19,8 +12,10 @@ from db.schemas.operations.create import create_schema as create_sa_schema from db.schemas.utils import get_schema_oid_from_name, get_schema_name_from_oid from db.tables.operations.select import get_oid_from_table -from mathesar.models import Schema, Table + +from mathesar.models import Schema, Table, Database, DataFile from mathesar.database.base import create_mathesar_engine +from mathesar.imports.csv import create_table_from_csv PATENT_SCHEMA = 'Patents' @@ -163,6 +158,7 @@ def empty_nasa_table(patent_schema): table.delete_sa_table() table.delete() + @pytest.fixture def create_table(csv_filename, create_schema): with open(csv_filename, 'rb') as csv_file: