Merge branch 'master' into fix-params-index

filmor · web-flow · commit 13871f2a035f · 2020-12-09T13:11:20.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,69 @@
+name: GitHub Actions
+
+on: [ pull_request, push ]
+
+jobs:
+  build-test:
+    name: Build and Test
+    runs-on: ubuntu-16.04
+
+    strategy:
+      matrix:
+        python: [3.6,3.7,3.8,3.9]
+        shutdown_mode: [Normal,Soft]
+        toolset: [Mono,.NET]
+        include:
+          - toolset: .NET
+            BUILD_OPTS: --xplat
+            RUN_TESTS: dotnet
+            EMBED_TESTS_PATH: netcoreapp3.1_publish/
+            PERF_TESTS_PATH: net461/
+          - toolset: Mono
+            BUILD_OPTS: ""
+            RUN_TESTS: "mono ./packages/NUnit.*/tools/nunit3-console.exe"
+            EMBED_TESTS_PATH: ""
+            PERF_TESTS_PATH: ""
+            
+    env:
+      BUILD_OPTS: ${{ matrix.BUILD_OPTS }}
+      RUN_TESTS: ${{ matrix.RUN_TESTS }}
+      EMBED_TESTS_PATH: ${{ matrix.EMBED_TESTS_PATH }}
+      PERF_TESTS_PATH: ${{ matrix.PERF_TESTS_PATH }}
+      PYTHONNET_SHUTDOWN_MODE: ${{ matrix.SHUTDOWN_MODE }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install Mono
+        if: ${{ matrix.toolset == 'Mono' }}
+        run: |
+          sudo apt update
+          sudo apt install mono-devel ca-certificates-mono -y
+
+      - name: Install .NET
+        if: ${{ matrix.toolset == '.NET' }}
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1.x
+
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Install dependencies
+        run: |
+          pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
+          pip install --upgrade -r requirements.txt
+
+      - name: Install
+        run: |
+          echo $BUILD_OPTS
+          python setup.py install $BUILD_OPTS
+
+      - name: Python Tests
+        run: pytest
+
+      - name: .NET Tests
+        run: $RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll --labels=All
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,11 +18,13 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 details about the cause of the failure
 -   `clr.AddReference` no longer adds ".dll" implicitly
 -   `PyIter(PyObject)` constructor replaced with static `PyIter.GetIter(PyObject)` method
--    Return values from .NET methods that return an interface are now automatically
+-   BREAKING: Return values from .NET methods that return an interface are now automatically
      wrapped in that interface. This is a breaking change for users that rely on being
      able to access members that are part of the implementation class, but not the
      interface.  Use the new __implementation__ or __raw_implementation__ properties to
      if you need to "downcast" to the implementation class.
+-   BREAKING: Parameters marked with `ParameterAttributes.Out` are no longer returned in addition
+     to the regular method return value (unless they are passed with `ref` or `out` keyword).
 
 ### Fixed
 
diff --git a/pythonnet.15.sln b/pythonnet.15.sln
@@ -24,10 +24,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Repo", "Repo", "{441A0123-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CI", "CI", "{D301657F-5EAF-4534-B280-B858D651B2E5}"
 	ProjectSection(SolutionItems) = preProject
-		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
 		ci\appveyor_build_recipe.ps1 = ci\appveyor_build_recipe.ps1
 		ci\appveyor_run_tests.ps1 = ci\appveyor_run_tests.ps1
+		.github\workflows\main.yml = .github\workflows\main.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{57F5D701-F265-4736-A5A2-07249E7A4DA3}"
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -534,7 +534,7 @@ static object[] TryConvertArguments(ParameterInfo[] pi, bool paramsArray,
                     Runtime.XDecref(op);
                 }
 
-                if (parameter.IsOut || isOut)
+                if (isOut)
                 {
                     outs++;
                 }
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -761,7 +761,7 @@ def test_we_can_bind_to_encoding_get_string():
     read = 1
 
     while read > 0:
-        read, _ = stream.Read(buff, 0, buff.Length)
+        read = stream.Read(buff, 0, buff.Length)
         temp = Encoding.UTF8.GetString(buff, 0, read)
         data.append(temp)
 

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ static object[] TryConvertArguments(ParameterInfo[] pi, bool paramsArray,`
`534`	`534`	`Runtime.XDecref(op);`
`535`	`535`	`}`
`536`	`536`
`537`		`- if (parameter.IsOut \|\| isOut)`
	`537`	`+ if (isOut)`
`538`	`538`	`{`
`539`	`539`	`outs++;`
`540`	`540`	`}`