Skip to content

Commit

Permalink
Revert "fix relative imports in tests"
Browse files Browse the repository at this point in the history
This reverts commit 3c2656e.
  • Loading branch information
mxndrwgrdnr committed Jun 27, 2018
1 parent 3c2656e commit d1de14a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion synthpop/ipf/test/test_ipf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pytest
from pandas.util import testing as pdt

from synthpop.ipf import ipf
from .. import ipf


def test_trivial_ipf():
Expand Down
4 changes: 3 additions & 1 deletion synthpop/ipu/test/test_ipu.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
import numpy.testing as npt
import pandas as pd
import pytest
from synthpop.ipu import ipu
from pandas.util import testing as pdt

from .. import ipu


@pytest.fixture(scope='module')
Expand Down
10 changes: 2 additions & 8 deletions synthpop/recipes/tests/test_starter.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import pytest
from synthpop.synthesizer import *
from synthpop.recipes.starter import Starter
from synthpop.recipes.starter2 import Starter as Starter2
from ...synthesizer import *
from ..starter import Starter


@pytest.fixture
Expand All @@ -12,8 +11,3 @@ def key():
def test_starter(key):
st = Starter(key, "CA", "Napa County")
synthesize_all(st, num_geogs=1)


def test_starter2(key):
st = Starter2(key, "CA", "Napa County")
synthesize_all(st, num_geogs=1)
3 changes: 2 additions & 1 deletion synthpop/test/test_censushelpers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import pytest
from synthpop.census_helpers import Census
from ..census_helpers import Census
import numpy as np
from pandas.util.testing import assert_series_equal
import os


@pytest.fixture
Expand Down
4 changes: 2 additions & 2 deletions synthpop/test/test_draw.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import pytest
from pandas.util import testing as pdt

from synthpop import draw
from synthpop.ipu.ipu import _FrequencyAndConstraints
from .. import draw
from ..ipu.ipu import _FrequencyAndConstraints


@pytest.fixture
Expand Down

0 comments on commit d1de14a

Please sign in to comment.