Skip to content

Try dealing with the backwards incompatible changes in setuptools again #263

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

Merged
merged 3 commits into from
Jun 6, 2016
Merged

Try dealing with the backwards incompatible changes in setuptools again #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5b0dc2
Make sure setup.py works regardless of cwd
gsnedders Jun 6, 2016
21aabd6
Try fixing #231 again: Return to using platform_python_implementation
gsnedders Jun 6, 2016
c562f28
Give a more useful error message than a SyntaxError on old setuptools
gsnedders Jun 6, 2016
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
2 changes: 1 addition & 1 deletion requirements-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
fi

# Make sure we're running setuptools >= 18.5
pip install -U pip setuptools
pip install -U pip setuptools>=18.5

pip install -U -r requirements-test.txt

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
six
webencodings
ordereddict ; python_version < '2.7'
setuptools>=18.5
19 changes: 14 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
from __future__ import print_function

import ast
import codecs
import sys

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

if parse_version(setuptools_version) < parse_version("18.5"):
print("html5lib requires setuptools version 18.5 or above; "
"please upgrade before installing (you have %s)" % setuptools_version)
sys.exit(1)

classifiers = [
'Development Status :: 5 - Production/Stable',
Expand All @@ -28,7 +36,7 @@
long_description = readme_file.read() + '\n' + changes_file.read()

version = None
with open(join("html5lib", "__init__.py"), "rb") as init_file:
with open(join(here, "html5lib", "__init__.py"), "rb") as init_file:
t = ast.parse(init_file.read(), filename="__init__.py", mode="exec")
assert isinstance(t, ast.Module)
assignments = filter(lambda x: isinstance(x, ast.Assign), t.body)
Expand All @@ -52,6 +60,7 @@
install_requires=[
'six',
'webencodings',
'setuptools>=18.5'
],
extras_require={
# A empty extra that only has a conditional marker will be
Expand All @@ -60,8 +69,8 @@

# A conditional extra will only install these items when the extra is
# requested and the condition matches.
"datrie:platform.python_implementation == 'CPython'": ["datrie"],
"lxml:platform.python_implementation == 'CPython'": ["lxml"],
"datrie:platform_python_implementation == 'CPython'": ["datrie"],
"lxml:platform_python_implementation == 'CPython'": ["lxml"],

# Standard extras, will be installed when the extra is requested.
"genshi": ["genshi"],
Expand All @@ -72,6 +81,6 @@
# extra that will be installed whenever the condition matches and the
# all extra is requested.
"all": ["genshi", "chardet>=2.2"],
"all:platform.python_implementation == 'CPython'": ["datrie", "lxml"],
"all:platform_python_implementation == 'CPython'": ["datrie", "lxml"],
},
)