Skip to content

Commit df28237

Browse files
authored
Merge pull request #544 from fastai/revert-542-master
2 parents 76a2ad5 + ff9534d commit df28237

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

fastcore/xtras.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,9 @@ def console_help(
559559
libname:str): # name of library for console script listing
560560
"Show help for all console scripts from `libname`"
561561
from fastcore.style import S
562-
from importlib.metadata import entry_points as ep_il
563-
for e in ep_il(group='console_scripts'):
564-
if e.value == libname or e.value.startswith(libname+'.'):
562+
from pkg_resources import iter_entry_points as ep
563+
for e in ep('console_scripts'):
564+
if e.module_name == libname or e.module_name.startswith(libname+'.'):
565565
nm = S.bold.light_blue(e.name)
566566
print(f'{nm:45}{e.load().__doc__}')
567567

nbs/03_xtras.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,9 +2357,9 @@
23572357
" libname:str): # name of library for console script listing\n",
23582358
" \"Show help for all console scripts from `libname`\"\n",
23592359
" from fastcore.style import S\n",
2360-
" from importlib.metadata import entry_points as ep_il\n",
2361-
" for e in ep_il(group='console_scripts'): \n",
2362-
" if e.value == libname or e.value.startswith(libname+'.'): \n",
2360+
" from pkg_resources import iter_entry_points as ep\n",
2361+
" for e in ep('console_scripts'): \n",
2362+
" if e.module_name == libname or e.module_name.startswith(libname+'.'): \n",
23632363
" nm = S.bold.light_blue(e.name)\n",
23642364
" print(f'{nm:45}{e.load().__doc__}')\n"
23652365
]

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from packaging.version import Version
1+
from pkg_resources import parse_version
22
from configparser import ConfigParser
33
import setuptools,re,sys
4-
assert Version(setuptools.__version__)>=Version('36.2')
4+
assert parse_version(setuptools.__version__)>=parse_version('36.2')
55

66
# note: all settings are in settings.ini; edit there, not here
77
config = ConfigParser(delimiters=['='])

0 commit comments

Comments
 (0)