Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 8 additions & 15 deletions pyasdf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
BSD 3-Clause ("BSD New" or "BSD Simplified")
"""

import sys
try:
from importlib.metadata import PackageNotFoundError, version
except ImportError:
from importlib_metadata import PackageNotFoundError, version


from .exceptions import ASDFException, ASDFWarning, WaveformNotInFileException
Expand All @@ -24,20 +27,10 @@
]


if sys.version_info.minor >= 9:
from importlib.metadata import version, PackageNotFoundError

try:
__version__ = version("pyasdf")
except PackageNotFoundError:
pass
else:
import pkg_resources

try:
__version__ = pkg_resources.get_distribution("pyasdf").version
except pkg_resources.DistributionNotFound:
pass
try:
__version__ = version("pyasdf")
except PackageNotFoundError:
pass


def print_sys_info():
Expand Down
10 changes: 7 additions & 3 deletions pyasdf/watermark.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
BSD 3-Clause ("BSD New" or "BSD Simplified")
"""

from multiprocessing import cpu_count
from pkg_resources import get_distribution
import platform
from multiprocessing import cpu_count
from socket import gethostname
from time import strftime

import h5py

try:
from importlib.metadata import version
except ImportError:
from importlib_metadata import version

try:
from mpi4py import MPI
except ImportError:
Expand Down Expand Up @@ -65,7 +69,7 @@ def get_watermark():
}

watermark["module_versions"] = {
module: get_distribution(module).version for module in modules
module: version(module) for module in modules
}
if MPI is None:
watermark["module_versions"]["mpi4py"] = None
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies = [
"colorama",
"dill",
"h5py",
"importlib-metadata; python_version < '3.8'",
"numpy",
"obspy>=1.2.1",
"packaging",
Expand Down