Unverified Commit ca80579a authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

Use importlib_metadata instead of pkg_resources (#3485)

* Use importlib_metadata instead of pkg_resources

* Use built in importlib when available

* Revert change that didn't work
parent e581f42b
...@@ -57,11 +57,11 @@ def _getDataDirectories(): ...@@ -57,11 +57,11 @@ def _getDataDirectories():
if _dataDirectories is None: if _dataDirectories is None:
_dataDirectories = [os.path.join(os.path.dirname(__file__), 'data')] _dataDirectories = [os.path.join(os.path.dirname(__file__), 'data')]
try: try:
from pkg_resources import iter_entry_points from importlib_metadata import entry_points
for entry in iter_entry_points(group='openmm.forcefielddir'): for entry in entry_points().select(group='openmm.forcefielddir'):
_dataDirectories.append(entry.load()()) _dataDirectories.append(entry.load()())
except: except:
pass # pkg_resources is not installed pass # importlib_metadata is not installed
return _dataDirectories return _dataDirectories
def _convertParameterToNumber(param): def _convertParameterToNumber(param):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment