Skip to content

Commit 0705846

Browse files
authored
Move variable __gmt_version__ to pygmt.clib to avoid cyclic-import errors (#2713)
1 parent af1d7ea commit 0705846

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

pygmt/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@
2121
import sys
2222
from importlib.metadata import version
2323

24-
from pygmt import clib
25-
2624
# Get semantic version through setuptools-scm
2725
__version__ = f'v{version("pygmt")}' # e.g. v0.1.2.dev3+g0ab3cd78
2826
__commit__ = __version__.split("+g")[-1] if "+g" in __version__ else "" # 0ab3cd78
29-
with clib.Session() as lib:
30-
__gmt_version__ = lib.info["version"]
3127

3228
# Import modules to make the high-level GMT Python API
3329
from pygmt import datasets

pygmt/clib/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
"""
77

88
from pygmt.clib.session import Session
9+
10+
with Session() as lib:
11+
__gmt_version__ = lib.info["version"]

pygmt/src/ternary.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"""
44
import pandas as pd
55
from packaging.version import Version
6-
from pygmt import __gmt_version__
7-
from pygmt.clib import Session
6+
from pygmt.clib import Session, __gmt_version__
87
from pygmt.helpers import build_arg_string, fmt_docstring, kwargs_to_strings, use_alias
98

109

pygmt/src/timestamp.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import warnings
55

66
from packaging.version import Version
7-
from pygmt import __gmt_version__
8-
from pygmt.clib import Session
7+
from pygmt.clib import Session, __gmt_version__
98
from pygmt.helpers import build_arg_string, is_nonstr_iter
109

1110
__doctest_skip__ = ["timestamp"]

pygmt/tests/test_accessor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import pytest
99
import xarray as xr
1010
from packaging.version import Version
11-
from pygmt import __gmt_version__, which
11+
from pygmt import which
12+
from pygmt.clib import __gmt_version__
1213
from pygmt.datasets import load_earth_relief
1314
from pygmt.exceptions import GMTInvalidInput
1415

pygmt/tests/test_grdfill.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import pytest
88
import xarray as xr
99
from packaging.version import Version
10-
from pygmt import __gmt_version__, grdfill, load_dataarray
10+
from pygmt import grdfill, load_dataarray
11+
from pygmt.clib import __gmt_version__
1112
from pygmt.exceptions import GMTInvalidInput
1213
from pygmt.helpers import GMTTempFile
1314
from pygmt.helpers.testing import load_static_earth_relief

pygmt/tests/test_meca.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import pandas as pd
66
import pytest
77
from packaging.version import Version
8-
from pygmt import Figure, __gmt_version__
8+
from pygmt import Figure
9+
from pygmt.clib import __gmt_version__
910
from pygmt.exceptions import GMTInvalidInput
1011
from pygmt.helpers import GMTTempFile
1112

0 commit comments

Comments
 (0)