Commitbdf1e68

committed

Merge remote-tracking branch 'origin/master' into appveyor

2 parentsb8b025f +4592785 commitbdf1e68Copy full SHA for bdf1e68

File tree

+21

-3

lines changed

+21

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -136,4 +136,4 @@ return to a proper state, which means`
`136`	`136`	`* no open pull requests`
`137`	`137`	`* no open issues describing bugs`
`138`	`138`
`139`		`-[contributing]:https://github.com/gitpython-developers/GitPython/blob/master/README.md`
	`139`	`+[contributing]:https://github.com/gitpython-developers/GitPython/blob/master/CONTRIBUTING.md`

Lines changed: 20 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,10 +70,26 @@ 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`		`-test_requires= ['node','ddt']`
	`73`	`+extras_require= {`
	`74`	`+':python_version == "2.6"': ['ordereddict'],`
	`75`	`+}`
	`76`	`+test_requires= ['ddt']`
`72`	`77`	`ifsys.version_info[:2]< (2,7):`
`73`		`-install_requires.append('ordereddict')`
`74`	`78`	`test_requires.append('mock')`
	`79`	`+`
	`80`	`+try:`
	`81`	`+if'bdist_wheel'notinsys.argv:`
	`82`	`+forkey,valueinextras_require.items():`
	`83`	`+ifkey.startswith(':')andpkg_resources.evaluate_marker(key[1:]):`
	`84`	`+install_requires.extend(value)`
	`85`	`+exceptException:`
	`86`	`+logging.getLogger(__name__).exception(`
	`87`	`+'Something went wrong calculating platform specific dependencies, so '`
	`88`	`+"you're getting them all!"`
	`89`	`+ )`
	`90`	`+forkey,valueinextras_require.items():`
	`91`	`+ifkey.startswith(':'):`
	`92`	`+install_requires.extend(value)`
`75`	`93`	`# end`
`76`	`94`
`77`	`95`	`setup(`

Comments

(0)