Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Only import pkg_resources where it's needed" 

This reverts commit 5ed8c03afa.
This commit is contained in:
Ines Montani 2019-10-07 13:26:03 +02:00
parent 9f071f5c40
commit 8b30b57957
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spacy/cli/download.py
View File

@ -6,6 +6,7 @@ import requests
import os import os
import subprocess import subprocess
import sys import sys
import pkg_resources
from wasabi import Printer from wasabi import Printer
from .link import link from .link import link
@ -86,8 +87,6 @@ def download(model, direct=False, *pip_args):
def require_package(name): def require_package(name):
try: try:
import pkg_resources
pkg_resources.working_set.require(name) pkg_resources.working_set.require(name)
return True return True
except: # noqa: E722 except: # noqa: E722

3
spacy/cli/validate.py
View File

@ -1,6 +1,7 @@
# coding: utf8 # coding: utf8
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
import pkg_resources
from pathlib import Path from pathlib import Path
import sys import sys
import requests import requests
@ -108,8 +109,6 @@ def get_model_links(compat):
def get_model_pkgs(compat, all_models): def get_model_pkgs(compat, all_models):
import pkg_resources
pkgs = {} pkgs = {}
for pkg_name, pkg_data in pkg_resources.working_set.by_key.items(): for pkg_name, pkg_data in pkg_resources.working_set.by_key.items():
package = pkg_name.replace("-", "_") package = pkg_name.replace("-", "_")

3
spacy/util.py
View File

@ -2,6 +2,7 @@
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
import os import os
import pkg_resources
import importlib import importlib
import re import re
from pathlib import Path from pathlib import Path
@ -252,8 +253,6 @@ def is_package(name):
name (unicode): Name of package. name (unicode): Name of package.
RETURNS (bool): True if installed package, False if not. RETURNS (bool): True if installed package, False if not.
""" """
import pkg_resources
name = name.lower() # compare package name against lowercase name name = name.lower() # compare package name against lowercase name
packages = pkg_resources.working_set.by_key.keys() packages = pkg_resources.working_set.by_key.keys()
for package in packages: for package in packages: