diff --git a/Build/steps.yml b/Build/steps.yml index a38e3edc3..60decfcf5 100644 --- a/Build/steps.yml +++ b/Build/steps.yml @@ -34,7 +34,7 @@ steps: displayName: Install .NET Core 3.0 SDK for build inputs: packageType: 'sdk' - version: '3.0.100-preview5-011568' + version: '3.0.100' # Install mono when running on Linux - ${{ if eq(parameters.os, 'Linux') }}: diff --git a/IronPython.ruleset b/IronPython.ruleset index 2f7d3d494..3020c9e0d 100644 --- a/IronPython.ruleset +++ b/IronPython.ruleset @@ -1,257 +1,90 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/IronPython.sln b/IronPython.sln index def0a57ce..973873995 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CurrentVersion.props = CurrentVersion.props Directory.Build.props = Directory.Build.props IronPython.nuspec = IronPython.nuspec + IronPython.ruleset = IronPython.ruleset IronPython.StdLib.nuspec = IronPython.StdLib.nuspec LICENSE = LICENSE make.cmd = make.cmd diff --git a/Src/DLR b/Src/DLR index 6cb79d2f8..805907c6c 160000 --- a/Src/DLR +++ b/Src/DLR @@ -1 +1 @@ -Subproject commit 6cb79d2f82b5d0241f8c1d2086c829151bbd3246 +Subproject commit 805907c6cf8bef7f4a05e4635f485211a9646ca5 diff --git a/Src/IronPython.Modules/IronPython.Modules.csproj b/Src/IronPython.Modules/IronPython.Modules.csproj index 1899fbb03..3cdcc7a1c 100644 --- a/Src/IronPython.Modules/IronPython.Modules.csproj +++ b/Src/IronPython.Modules/IronPython.Modules.csproj @@ -26,8 +26,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPython.Modules/_ctypes/CFuncPtr.cs b/Src/IronPython.Modules/_ctypes/CFuncPtr.cs index c11c2f273..038de04e9 100644 --- a/Src/IronPython.Modules/_ctypes/CFuncPtr.cs +++ b/Src/IronPython.Modules/_ctypes/CFuncPtr.cs @@ -493,7 +493,6 @@ private INativeType GetNativeReturnType() { private ArgumentMarshaller/*!*/[]/*!*/ GetArgumentMarshallers(DynamicMetaObject/*!*/[]/*!*/ args) { CFuncPtrType funcType = ((CFuncPtrType)Value.NativeType); ArgumentMarshaller[] res = new ArgumentMarshaller[args.Length]; - // first arg is taken by self if we're a com method for (int i = 0; i < args.Length; i++) { diff --git a/Src/IronPython/IronPython.csproj b/Src/IronPython/IronPython.csproj index b1734f6f9..ed3ca85ce 100644 --- a/Src/IronPython/IronPython.csproj +++ b/Src/IronPython/IronPython.csproj @@ -49,8 +49,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPython/Runtime/PythonDictionary.cs b/Src/IronPython/Runtime/PythonDictionary.cs index e2ff8d8ad..e7324a725 100644 --- a/Src/IronPython/Runtime/PythonDictionary.cs +++ b/Src/IronPython/Runtime/PythonDictionary.cs @@ -939,6 +939,7 @@ object IEnumerator.Current { } void IDisposable.Dispose() { + _keys.Dispose(); } public object __iter__() { diff --git a/Src/IronPythonCompiler/IronPythonCompiler.csproj b/Src/IronPythonCompiler/IronPythonCompiler.csproj index 7acc83869..70d7494f3 100644 --- a/Src/IronPythonCompiler/IronPythonCompiler.csproj +++ b/Src/IronPythonCompiler/IronPythonCompiler.csproj @@ -32,7 +32,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonConsole/IronPythonConsole.csproj b/Src/IronPythonConsole/IronPythonConsole.csproj index 0adc3efa1..29cc6c8fc 100644 --- a/Src/IronPythonConsole/IronPythonConsole.csproj +++ b/Src/IronPythonConsole/IronPythonConsole.csproj @@ -20,7 +20,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonConsoleAny/IronPythonConsoleAny.csproj b/Src/IronPythonConsoleAny/IronPythonConsoleAny.csproj index a359ea5eb..46bec4cc9 100644 --- a/Src/IronPythonConsoleAny/IronPythonConsoleAny.csproj +++ b/Src/IronPythonConsoleAny/IronPythonConsoleAny.csproj @@ -46,7 +46,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonTest/IronPythonTest.csproj b/Src/IronPythonTest/IronPythonTest.csproj index 414800e95..0b689b3b6 100644 --- a/Src/IronPythonTest/IronPythonTest.csproj +++ b/Src/IronPythonTest/IronPythonTest.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/Src/IronPythonWindow/IronPythonWindow.csproj b/Src/IronPythonWindow/IronPythonWindow.csproj index e9e1e3128..012b0ff51 100644 --- a/Src/IronPythonWindow/IronPythonWindow.csproj +++ b/Src/IronPythonWindow/IronPythonWindow.csproj @@ -24,7 +24,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonWindowAny/IronPythonWindowAny.csproj b/Src/IronPythonWindowAny/IronPythonWindowAny.csproj index e3811b323..f741cc9d6 100644 --- a/Src/IronPythonWindowAny/IronPythonWindowAny.csproj +++ b/Src/IronPythonWindowAny/IronPythonWindowAny.csproj @@ -27,7 +27,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Tests/test_formatting.py b/Tests/test_formatting.py index 975524c8a..c13e78443 100644 --- a/Tests/test_formatting.py +++ b/Tests/test_formatting.py @@ -308,10 +308,6 @@ def test_format_testfile(self): """the following is borrowed from stdlib""" import math format_testfile = 'formatfloat_testcases.txt' - bugged = { - ('%.2f', 0.004999): "0.01", - ('%f', 4.9989999999999997e-07): "0.000001", - } with open(os.path.join(self.test_dir, format_testfile)) as testfile: for line in testfile: print line @@ -324,8 +320,6 @@ def test_format_testfile(self): lhs, rhs = map(str.strip, line.split('->')) fmt, arg = lhs.split() arg = float(arg) - if is_netcoreapp30: # https://github.com/dotnet/corefx/issues/37524 - rhs = bugged.get((fmt, arg), rhs) self.assertEqual(fmt % arg, rhs) if not math.isnan(arg) and math.copysign(1.0, arg) > 0.0: print("minus")