Skip to content

Commit

Permalink
Linter fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dmos62 committed Feb 28, 2022
1 parent 90b4ee1 commit cb9a118
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions mathesar/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit cb9a118

Please sign in to comment.