Skip to content

Commit a6fee08

Browse files
committed
Remove dependence on pkg_resources
1 parent f63ca01 commit a6fee08

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎devtools/ci/push-docs-to-s3.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import print_function
22
import os
3-
import pkg_resources
43
import tempfile
54
import subprocess
5+
from importlib import metadata
66
import openpathsampling.version
77

88
import argparse
@@ -23,10 +23,11 @@
2323
# PREFIX = openpathsampling.version.short_version
2424

2525
def is_s3cmd_installed():
26-
dists = pkg_resources.working_set
27-
if not any(d.project_name == 's3cmd' for d in dists):
26+
try:
27+
metadata.distribution('s3cmd')
28+
except metadata.PackageNotFoundError as exc:
2829
raise ImportError('The s3cmd package is required. '
29-
'try $ pip install s3cmd')
30+
'try $ pip install s3cmd') from exc
3031

3132
def run_cmd(template, config_filename, dry=False):
3233
cmd = template.format(
@@ -73,4 +74,3 @@ def run_cmd(template, config_filename, dry=False):
7374
#config=f.name,
7475
#bucket=BUCKET_NAME)
7576
#return_val = subprocess.call(cmd.split())
76-

‎docs/conf.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import sys
1616
import os
1717
import shutil
18+
from importlib.metadata import PackageNotFoundError, version as get_version
1819

1920
# we use these to get the version
20-
import pkg_resources
2121
import packaging.version
2222

2323
import openpathsampling
@@ -136,7 +136,10 @@ def gen_cli_docs(config_file, stdout=False):
136136
# built documents.
137137
#
138138
# The full version, including alpha/beta/rc tags.
139-
release = pkg_resources.get_distribution('openpathsampling').version
139+
try:
140+
release = get_version('openpathsampling')
141+
except PackageNotFoundError:
142+
release = openpathsampling.version.version
140143
# The short X.Y version.
141144
# version = packaging.version.Version(release).base_version
142145
version = release # prefer to have the .dev0 label on 'latest'

‎openpathsampling/tests/test_helpers.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
@author David W.H. Swenson
66
"""
77

8-
import os
98
from functools import wraps
9+
from importlib.resources import files
1010
from openpathsampling.engines import NoEngine
1111
import numpy as np
1212
import numpy.testing as npt
@@ -19,8 +19,6 @@
1919
except ImportError:
2020
md = None
2121

22-
from pkg_resources import resource_filename
23-
2422
import openpathsampling as paths
2523
import openpathsampling.engines.openmm as peng
2624
import openpathsampling.engines.toy as toys
@@ -178,8 +176,7 @@ def prepend_exception_message(e, failmsg):
178176
e.args = tuple([arg0] + list(e.args[1:]))
179177

180178
def data_filename(fname, subdir='test_data'):
181-
return resource_filename('openpathsampling',
182-
os.path.join('tests', subdir, fname))
179+
return str(files('openpathsampling.tests').joinpath(subdir, fname))
183180

184181
def true_func(value, *args, **kwargs):
185182
return True

0 commit comments

Comments
 (0)