Commitf0c5f62

authored

Merge branch 'master' into patch-1

2 parents7dde536 +f0f6b6b commitf0c5f62Copy full SHA for f0c5f62

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,5 @@`
`48`	`48`	`- ([@rmadsen-ks](https://github.com/rmadsen-ks))`
`49`	`49`	`- ([@stonebig](https://github.com/stonebig))`
`50`	`50`	`- ([@testrunner123](https://github.com/testrunner123))`
	`51`	`+- ([@GSPP](https://github.com/GSPP))`
`51`	`52`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].`
`31`	`31`	- Fixed`clr.GetClrType` when iterating over`System` members (#607)
`32`	`32`	- Fixed`LockRecursionException` when loading assemblies (#627)
`33`	`33`	`- Fixed errors breaking .NET Remoting on method invoke (#276)`
	`34`	`+- Fixed PyObject.GetHashCode (#676)`
`34`	`35`
`35`	`36`
`36`	`37`	`##[2.3.0][] - 2017-03-11`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ init:`
`41`	`41`	`-set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%`
`42`	`42`
`43`	`43`	`install:`
	`44`	`+ -python -m pip install -U pip`
`44`	`45`	`-pip install --upgrade -r requirements.txt --quiet`
`45`	`46`
`46`	`47`	# Install OpenCover. Can't put on `packages.config`, not Mono compatible

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ coverage`
`6`	`6`	`codecov`
`7`	`7`
`8`	`8`	`# Platform specific requirements`
`9`		`-pip;sys_platform=='win32'`
	`9`	`+#pip; sys_platform == 'win32'`
`10`	`10`	`wheel;sys_platform=='win32'`
`11`	`11`	`pycparser;sys_platform!='win32'`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ public override bool Equals(object o)`
`909`	`909`	`/// </remarks>`
`910`	`910`	`publicoverrideintGetHashCode()`
`911`	`911`	`{`
`912`		`-returnRuntime.PyObject_Hash(obj).ToInt32();`
	`912`	`+return((ulong)Runtime.PyObject_Hash(obj)).GetHashCode();`
`913`	`913`	`}`
`914`	`914`
`915`	`915`

Comments

(0)