Skip to content

Commit

Permalink
change tests to working package import
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Moodie committed Jun 20, 2020
1 parent fb736c3 commit ef1c1ae
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions tests/test_consistent.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

from pyDeltaRCM import DeltaModel

from utilities import test_DeltaModel
import utilities
from .utilities import test_DeltaModel
from . import utilities

# need to create a simple case of pydeltarcm object to test these functions

Expand Down
4 changes: 2 additions & 2 deletions tests/test_deltaRCM_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

from pyDeltaRCM.model import DeltaModel

from utilities import test_DeltaModel
import utilities
from .utilities import test_DeltaModel
from . import utilities


def test_run_one_timestep(test_DeltaModel):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_init_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pyDeltaRCM.model import DeltaModel
from pyDeltaRCM import init_tools

from utilities import test_DeltaModel
from .utilities import test_DeltaModel


# tests for attrs set during yaml parsing
Expand Down
4 changes: 2 additions & 2 deletions tests/test_initialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from pyDeltaRCM.model import DeltaModel
from pyDeltaRCM import shared_tools

import utilities
from utilities import test_DeltaModel
from . import utilities
from .utilities import test_DeltaModel


# test yaml parsing
Expand Down
2 changes: 1 addition & 1 deletion tests/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import numpy as np

from utilities import test_DeltaModel
from .utilities import test_DeltaModel

# need to create a simple case of pydeltarcm object to test these functions

Expand Down
2 changes: 1 addition & 1 deletion tests/test_sed_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import numpy as np

from utilities import test_DeltaModel
from .utilities import test_DeltaModel


def test_sed_route_padding(test_DeltaModel):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_shared_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

from pyDeltaRCM.model import DeltaModel
from pyDeltaRCM import shared_tools
import utilities
from utilities import test_DeltaModel
from . import utilities
from .utilities import test_DeltaModel


def test_set_random_assignments(test_DeltaModel):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_water_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import numpy as np

from utilities import test_DeltaModel
from .utilities import test_DeltaModel
from pyDeltaRCM import shared_tools


Expand Down

0 comments on commit ef1c1ae

Please sign in to comment.