Skip to content

Commit 147483c

Browse files
committed
Fix merge mistake
1 parent 692e898 commit 147483c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tests/test_readers.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from itertools import chain, permutations
33
from pathlib import Path
44

5-
import pandas as pd
65
import duckdb
76
import numpy as np
7+
import pandas as pd
88
import toml
99
import xarray as xr
1010
from pytest import fixture, mark, raises
@@ -329,10 +329,11 @@ def default_new_input(tmp_path):
329329

330330
@fixture
331331
def con():
332-
from muse.new_input.readers import TableBase
333332
from sqlalchemy import create_engine
334333
from sqlalchemy.orm import Session
335334

335+
from muse.new_input.readers import TableBase
336+
336337
engine = create_engine("duckdb:///:memory:")
337338
session = Session(engine)
338339
TableBase.metadata.create_all(engine)
@@ -470,6 +471,7 @@ def test_new_read_demand_csv_primary_key_constraint(
470471
@mark.xfail
471472
def test_demand_dataset(default_new_input):
472473
import duckdb
474+
473475
from muse.new_input.readers import read_commodities, read_demand, read_regions
474476

475477
con = duckdb.connect(":memory:")
@@ -510,3 +512,4 @@ def test_new_read_initial_market(default_new_input):
510512
exports=np.float64,
511513
imports=np.float64,
512514
static_trade=np.float64,
515+
)

0 commit comments

Comments
 (0)