Skip to content

Commit fe690d7

Browse files
authored
remove obsolete use of pkg_resource (#12)
1 parent 8686a34 commit fe690d7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def get_version():
4949
packages=find_packages('src'),
5050
package_dir={'': 'src'},
5151
include_package_data=True,
52-
python_requires=">=3.7",
52+
python_requires=">=3.8",
5353
install_requires=[
5454
'setuptools',
5555
'funcparserlib>=1.0.0a0',

src/blockdiag/imagedraw/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
import pkg_resources
16+
from importlib import metadata
1717

1818
from blockdiag.utils.logging import warning
1919

2020
drawers = {}
2121

2222

2323
def init_imagedrawers(debug=False):
24-
for drawer in pkg_resources.iter_entry_points('blockdiag_imagedrawers'):
24+
for drawer in metadata.entry_points(group='blockdiag_imagedrawers'):
2525
try:
2626
module = drawer.load()
2727
if hasattr(module, 'setup'):
2828
module.setup(module)
2929
except Exception as exc:
3030
if debug:
31-
warning('Failed to load %s: %r' % (drawer.module_name, exc))
31+
warning('Failed to load %s: %r' % (drawer.name, exc))
3232

3333

3434
def install_imagedrawer(ext, drawer):

src/blockdiag/noderenderer/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
from __future__ import division
1717

18-
import pkg_resources
18+
from importlib import metadata
1919

2020
renderers = {}
2121
searchpath = []
2222

2323

2424
def init_renderers():
25-
for plugin in pkg_resources.iter_entry_points('blockdiag_noderenderer'):
25+
for plugin in metadata.entry_points(group='blockdiag_noderenderer'):
2626
module = plugin.load()
2727
if hasattr(module, 'setup'):
2828
module.setup(module)

src/blockdiag/plugins/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
from pkg_resources import iter_entry_points
16+
from importlib import metadata
1717

1818
from blockdiag.utils.logging import warning
1919

@@ -28,7 +28,7 @@ def load(plugins, diagram, **kwargs):
2828
warning('plugin "%s" is already loaded. ignored.', name)
2929
return
3030

31-
for ep in iter_entry_points('blockdiag_plugins', name):
31+
for ep in metadata.entry_points(group='blockdiag_plugins', name=name):
3232
module = ep.load()
3333
loaded_plugins.append(name)
3434
if hasattr(module, 'setup'):

0 commit comments

Comments
 (0)