Commit4592785

committed

Merge branch 'graingert-patch-2'

2 parents0900c55 +2253d39 commit4592785Copy full SHA for 4592785

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`fromdistutils.command.build_pyimportbuild_pyas_build_py`
`11`	`11`	`fromsetuptools.command.sdistimportsdistas_sdist`
	`12`	`+importpkg_resources`
	`13`	`+importlogging`
`12`	`14`	`importos`
`13`	`15`	`importsys`
`14`	`16`	`fromosimportpath`
`@@ -68,8 +70,23 @@ def _stamp_version(filename):`
`68`	`70`	`print("WARNING: Couldn't find version line in file %s"%filename,file=sys.stderr)`
`69`	`71`
`70`	`72`	`install_requires= ['gitdb >= 0.6.4']`
`71`		`-ifsys.version_info[:2]< (2,7):`
`72`		`-install_requires.append('ordereddict')`
	`73`	`+extras_require= {`
	`74`	`+':python_version == "2.6"': ['ordereddict'],`
	`75`	`+}`
	`76`	`+`
	`77`	`+try:`
	`78`	`+if'bdist_wheel'notinsys.argv:`
	`79`	`+forkey,valueinextras_require.items():`
	`80`	`+ifkey.startswith(':')andpkg_resources.evaluate_marker(key[1:]):`
	`81`	`+install_requires.extend(value)`
	`82`	`+exceptException:`
	`83`	`+logging.getLogger(__name__).exception(`
	`84`	`+'Something went wrong calculating platform specific dependencies, so '`
	`85`	`+"you're getting them all!"`
	`86`	`+ )`
	`87`	`+forkey,valueinextras_require.items():`
	`88`	`+ifkey.startswith(':'):`
	`89`	`+install_requires.extend(value)`
`73`	`90`	`# end`
`74`	`91`
`75`	`92`	`setup(`

Comments

(0)