Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace pkg_resources with importlib.metadata #1674

Merged
merged 8 commits into from
Dec 20, 2021
Merged

Replace pkg_resources with importlib.metadata #1674

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb5fa5b
Replace pkg_resources with importlib.metadata
michaelgrund Dec 19, 2021
e1907b0
format
michaelgrund Dec 19, 2021
e692bd1
Merge branch 'main' into repl-pkg-resources
michaelgrund Dec 20, 2021
77db4c1
Merge branch 'main' into repl-pkg-resources
michaelgrund Dec 20, 2021
6e4866c
rename version variables
michaelgrund Dec 20, 2021
4198fec
Merge branch 'main' into repl-pkg-resources
michaelgrund Dec 20, 2021
edaeb36
Update pygmt/__init__.py
michaelgrund Dec 20, 2021
52642f6
Apply suggestions from code review
michaelgrund Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions pygmt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"""

import atexit as _atexit

from pkg_resources import get_distribution
from importlib.metadata import version
michaelgrund marked this conversation as resolved.
Show resolved Hide resolved

# Import modules to make the high-level GMT Python API
from pygmt import datasets
Expand Down Expand Up @@ -63,7 +62,7 @@
)

# Get semantic version through setuptools-scm
__version__ = f'v{get_distribution("pygmt").version}' # e.g. v0.1.2.dev3+g0ab3cd78
__version__ = f'v{version("pygmt")}' # e.g. v0.1.2.dev3+g0ab3cd78
__commit__ = __version__.split("+g")[-1] if "+g" in __version__ else "" # 0ab3cd78

# Start our global modern mode session
Expand Down Expand Up @@ -135,10 +134,9 @@ def _get_ghostscript_version():

for gs_cmd in cmds:
try:
version = subprocess.check_output(
return subprocess.check_output(
[gs_cmd, "--version"], universal_newlines=True
).strip()
return version
except FileNotFoundError:
continue
return None
Expand All @@ -148,10 +146,9 @@ def _get_gmt_version():
Get GMT version.
"""
try:
version = subprocess.check_output(
return subprocess.check_output(
["gmt", "--version"], universal_newlines=True
).strip()
return version
except FileNotFoundError:
return None

Expand Down