镜像站点 · 本页由第三方 GitHub 只读镜像提供，非 GitHub 官方站点，不接受任何登录或凭据输入。前往 github.com
Skip to content

setup: make pkg_resources optional #605

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
xingyaner wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

setup: make pkg_resources optional #605

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
9 changes: 5 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@

from os.path import join, dirname
from setuptools import setup, find_packages, __version__ as setuptools_version
from pkg_resources import parse_version

import pkg_resources
try:
import pkg_resources
except ImportError:
pkg_resources = None

try:
import _markerlib.markers
Expand Down Expand Up @@ -50,7 +51,7 @@ def default_environment():
# recognise the markers needed by this setup.py
# Change this to setuptools 20.10.0 to support all markers.
if pkg_resources:
if parse_version(setuptools_version) < parse_version('18.5'):
if (pkg_resources.parse_version(setuptools_version) < pkg_resources.parse_version('18.5')):
MarkerEvaluation = pkg_resources.MarkerEvaluation

del pkg_resources.parser
Expand Down