mirror of https://github.com/scrapy/scrapy.git
Merge pull request #5958 from Laerte/master
Remove `pkg_resources` usage
This commit is contained in:
commit
e9e1034af3
|
|
@ -70,7 +70,7 @@ If your requirement is a minimum Scrapy version, you may use
|
|||
|
||||
.. code-block:: python
|
||||
|
||||
from pkg_resources import parse_version
|
||||
from packaging.version import parse as parse_version
|
||||
|
||||
import scrapy
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@ import cProfile
|
|||
import inspect
|
||||
import os
|
||||
import sys
|
||||
|
||||
import pkg_resources
|
||||
from importlib.metadata import entry_points
|
||||
|
||||
import scrapy
|
||||
from scrapy.commands import BaseRunSpiderCommand, ScrapyCommand, ScrapyHelpFormatter
|
||||
|
|
@ -49,7 +48,7 @@ def _get_commands_from_module(module, inproject):
|
|||
|
||||
def _get_commands_from_entry_points(inproject, group="scrapy.commands"):
|
||||
cmds = {}
|
||||
for entry_point in pkg_resources.iter_entry_points(group):
|
||||
for entry_point in entry_points().get(group, {}):
|
||||
obj = entry_point.load()
|
||||
if inspect.isclass(obj):
|
||||
cmds[entry_point.name] = obj()
|
||||
|
|
|
|||
30
setup.py
30
setup.py
|
|
@ -1,23 +1,10 @@
|
|||
from pathlib import Path
|
||||
|
||||
from pkg_resources import parse_version
|
||||
from setuptools import __version__ as setuptools_version
|
||||
from setuptools import find_packages, setup
|
||||
|
||||
version = (Path(__file__).parent / "scrapy/VERSION").read_text("ascii").strip()
|
||||
|
||||
|
||||
def has_environment_marker_platform_impl_support():
|
||||
"""Code extracted from 'pytest/setup.py'
|
||||
https://github.com/pytest-dev/pytest/blob/7538680c/setup.py#L31
|
||||
|
||||
The first known release to support environment marker with range operators
|
||||
it is 18.5, see:
|
||||
https://setuptools.readthedocs.io/en/latest/history.html#id235
|
||||
"""
|
||||
return parse_version(setuptools_version) >= parse_version("18.5")
|
||||
|
||||
|
||||
install_requires = [
|
||||
"Twisted>=18.9.0",
|
||||
"cryptography>=36.0.0",
|
||||
|
|
@ -36,19 +23,10 @@ install_requires = [
|
|||
"tldextract",
|
||||
"lxml>=4.4.1",
|
||||
]
|
||||
extras_require = {}
|
||||
cpython_dependencies = [
|
||||
"PyDispatcher>=2.0.5",
|
||||
]
|
||||
if has_environment_marker_platform_impl_support():
|
||||
extras_require[
|
||||
':platform_python_implementation == "CPython"'
|
||||
] = cpython_dependencies
|
||||
extras_require[':platform_python_implementation == "PyPy"'] = [
|
||||
"PyPyDispatcher>=2.1.0",
|
||||
]
|
||||
else:
|
||||
install_requires.extend(cpython_dependencies)
|
||||
extras_require = {
|
||||
':platform_python_implementation == "CPython"': ["PyDispatcher>=2.0.5"],
|
||||
':platform_python_implementation == "PyPy"': ["PyPyDispatcher>=2.1.0"],
|
||||
}
|
||||
|
||||
|
||||
setup(
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import sys
|
|||
import warnings
|
||||
from pathlib import Path
|
||||
|
||||
from pkg_resources import parse_version
|
||||
from packaging.version import parse as parse_version
|
||||
from pytest import mark, raises
|
||||
from twisted import version as twisted_version
|
||||
from twisted.internet import defer
|
||||
|
|
|
|||
Loading…
Reference in New Issue