Skip to content

Replace deprecated pkg_resources with packaging.requirements #6239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
junagent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace deprecated pkg_resources with packaging.requirements #6239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jina/orchestrate/deployments/install_requirements_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re

from typing import TYPE_CHECKING, Tuple, Dict, Optional, cast
from pkg_resources import Requirement
from packaging.requirements import Requirement

if TYPE_CHECKING: # pragma: no cover
from pathlib import Path
Expand Down Expand Up @@ -90,7 +90,7 @@ def _parse_requirement(line: str) -> 'Requirement':

line = f'{egg or name} @ {line}'

return Requirement.parse(line)
return Requirement(line)


def _expand_env_variables(line: str) -> str:
Expand Down Expand Up @@ -132,7 +132,7 @@ def _get_install_options(requirements_file: 'Path', excludes: Tuple[str] = ('jin
expand_req = _expand_env_variables(req)
req_spec = _parse_requirement(expand_req)

if req_spec.project_name not in excludes or len(req_spec.extras) > 0:
if req_spec.name not in excludes or len(req_spec.extras) > 0:
install_reqs.append(expand_req)
return install_reqs, install_options

Expand Down