Commit21aabd6

committed

Try fixing#231 again: Return to using platform_python_implementation

This makes us require setuptools>=18.5

1 parentd5b0dc2 commit21aabd6Copy full SHA for 21aabd6

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then`
`6`	`6`	`fi`
`7`	`7`
`8`	`8`	`# Make sure we're running setuptools >= 18.5`
`9`		`-pip install -U pip setuptools`
	`9`	`+pip install -U pip setuptools>=18.5`
`10`	`10`
`11`	`11`	`pip install -U -r requirements-test.txt`
`12`	`12`

Lines changed: 1 addition & 0 deletions

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@`
`52`	`52`	`install_requires=[`
`53`	`53`	`'six',`
`54`	`54`	`'webencodings',`
	`55`	`+'setuptools>=18.5'`
`55`	`56`	`],`
`56`	`57`	`extras_require={`
`57`	`58`	`# A empty extra that only has a conditional marker will be`
`@@ -60,8 +61,8 @@`
`60`	`61`
`61`	`62`	`# A conditional extra will only install these items when the extra is`
`62`	`63`	`# requested and the condition matches.`
`63`		`-"datrie:platform.python_implementation == 'CPython'": ["datrie"],`
`64`		`-"lxml:platform.python_implementation == 'CPython'": ["lxml"],`
	`64`	`+"datrie:platform_python_implementation == 'CPython'": ["datrie"],`
	`65`	`+"lxml:platform_python_implementation == 'CPython'": ["lxml"],`
`65`	`66`
`66`	`67`	`# Standard extras, will be installed when the extra is requested.`
`67`	`68`	`"genshi": ["genshi"],`
`@@ -72,6 +73,6 @@`
`72`	`73`	`# extra that will be installed whenever the condition matches and the`
`73`	`74`	`# all extra is requested.`
`74`	`75`	`"all": ["genshi","chardet>=2.2"],`
`75`		`-"all:platform.python_implementation == 'CPython'": ["datrie","lxml"],`
	`76`	`+"all:platform_python_implementation == 'CPython'": ["datrie","lxml"],`
`76`	`77`	`},`
`77`	`78`	`)`

Comments

(0)