Skip to content

Commit

Permalink
Merge pull request #138 from GPlates/circular_imports
Browse files Browse the repository at this point in the history
Correct circular imports for PTT
  • Loading branch information
brmather authored Nov 13, 2023
2 parents 64a25bd + 1db4775 commit eda0ab2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions gplately/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
pygplates,
read_geometries,
reconstruction,
ptt
)

from .data import DataCollection
Expand Down Expand Up @@ -221,6 +222,7 @@
"read_geometries",
"reconstruction",
"plate_model_manager",
"ptt",
# Classes
"DataCollection",
"DataServer",
Expand Down
4 changes: 2 additions & 2 deletions gplately/reconstruction.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import numpy as np
import pygplates

from . import ptt
from . import tools as _tools
import gplately.ptt as ptt
import gplately.tools as _tools
from .gpml import _load_FeatureCollection
from .pygplates import FeatureCollection as _FeatureCollection
from .pygplates import RotationModel as _RotationModel
Expand Down
1 change: 1 addition & 0 deletions tests-dir/pytestcases/test_0_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def test_gplately_modules():
from gplately import download
from gplately import tools
from gplately import grids
from gplately import ptt


def test_jupyter_available():
Expand Down

0 comments on commit eda0ab2

Please sign in to comment.