Add exception type
This commit is contained in:
@ -25,18 +25,18 @@ def get_version_number():
|
|||||||
|
|
||||||
vstring = None
|
vstring = None
|
||||||
if version_info.major == 3 and version_info.minor >= 8:
|
if version_info.major == 3 and version_info.minor >= 8:
|
||||||
from importlib.metadata import version
|
from importlib.metadata import version, PackageNotFoundError
|
||||||
try:
|
try:
|
||||||
vstring = version('lammps')
|
vstring = version('lammps')
|
||||||
except:
|
except PackageNotFoundError:
|
||||||
# nothing to do, ignore
|
# nothing to do, ignore
|
||||||
pass
|
pass
|
||||||
|
|
||||||
else:
|
else:
|
||||||
from pkg_resources import get_distribution
|
from pkg_resources import get_distribution, DistributionNotFound
|
||||||
try:
|
try:
|
||||||
vstring = get_distribution('lammps').version
|
vstring = get_distribution('lammps').version
|
||||||
except:
|
except DistributionNotFound:
|
||||||
# nothing to do, ignore
|
# nothing to do, ignore
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@ -100,7 +100,7 @@ class lammps(object):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
if ptr: self.lib = CDLL("",RTLD_GLOBAL)
|
if ptr: self.lib = CDLL("",RTLD_GLOBAL)
|
||||||
except:
|
except OSError:
|
||||||
self.lib = None
|
self.lib = None
|
||||||
|
|
||||||
# load liblammps.so unless name is given
|
# load liblammps.so unless name is given
|
||||||
@ -307,7 +307,7 @@ class lammps(object):
|
|||||||
from mpi4py import __version__ as mpi4py_version
|
from mpi4py import __version__ as mpi4py_version
|
||||||
# tested to work with mpi4py versions 2 and 3
|
# tested to work with mpi4py versions 2 and 3
|
||||||
self.has_mpi4py = mpi4py_version.split('.')[0] in ['2','3']
|
self.has_mpi4py = mpi4py_version.split('.')[0] in ['2','3']
|
||||||
except:
|
except ImportError:
|
||||||
# ignore failing import
|
# ignore failing import
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user