Skip to content

Commit 8d0fc2c

Browse files
filmorfilmor
authored
Merge branch 'master' into fix_kwarg_func_resolution
2 parents 980c231 + 7870a9f commit 8d0fc2c

38 files changed

+593
-235
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ dist: xenial
22
sudo: false
33
language: python
44
python:
5+
- 3.9
56
- 3.8
67
- 3.7
78
- 3.6
89

910
env:
1011
matrix:
11-
- BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/
12+
- BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp3.1_publish/ PERF_TESTS_PATH=net461/
1213
- BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""
13-
- PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/
14+
- PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp3.1_publish/ PERF_TESTS_PATH=net461/
1415
- PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""
1516

1617
global:
@@ -29,9 +30,7 @@ addons:
2930
packages:
3031
- mono-devel
3132
- ca-certificates-mono
32-
- dotnet-hostfxr-2.2
33-
- dotnet-runtime-2.2
34-
- dotnet-sdk-2.2
33+
- dotnet-sdk-3.1
3534

3635
before_install:
3736
# Set-up dll path for embedded tests

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ details about the cause of the failure
3333
- Indexers can now be used with interface objects
3434
- Fixed a bug where indexers could not be used if they were inherited
3535
- Made it possible to use `__len__` also on `ICollection<>` interface objects
36+
- Made it possible to call `ToString`, `GetHashCode`, and `GetType` on inteface objects
37+
38+
### Removed
39+
40+
- implicit assembly loading (you have to explicitly `clr.AddReference` before doing import)
3641

3742
## [2.5.0][] - 2020-06-14
3843

‎appveyor.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '{branch}-{build}'
22
build: off
33

44
image:
5-
- Visual Studio 2017
5+
- Visual Studio 2019
66

77
platform:
88
- x86
@@ -15,15 +15,20 @@ environment:
1515
CODECOV_ENV: PYTHON_VERSION, PLATFORM
1616

1717
matrix:
18+
- PYTHON_VERSION: 3.9
19+
BUILD_OPTS: --xplat
1820
- PYTHON_VERSION: 3.8
1921
BUILD_OPTS: --xplat
2022
- PYTHON_VERSION: 3.7
2123
BUILD_OPTS: --xplat
2224
- PYTHON_VERSION: 3.6
2325
BUILD_OPTS: --xplat
26+
- PYTHON_VERSION: 3.9
2427
- PYTHON_VERSION: 3.8
2528
- PYTHON_VERSION: 3.7
2629
- PYTHON_VERSION: 3.6
30+
- PYTHON_VERSION: 3.9
31+
PYTHONNET_SHUTDOWN_MODE: Soft
2732
- PYTHON_VERSION: 3.8
2833
PYTHONNET_SHUTDOWN_MODE: Soft
2934
- PYTHON_VERSION: 3.7

‎ci/appveyor_run_tests.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ if ($XPLAT){
9999
$DOTNET_CMD = "c:\Program Files (x86)\dotnet\dotnet"
100100
}
101101

102-
# Run Embedded tests for netcoreapp2.0 (OpenCover currently does not supports dotnet core)
103-
Write-Host ("Starting embedded tests for netcoreapp2.0") -ForegroundColor "Green"
104-
&$DOTNET_CMD ".\src\embed_tests\bin\netcoreapp2.0_publish\Python.EmbeddingTest.dll"
102+
# Run Embedded tests for netcoreapp3.1 (OpenCover currently does not supports dotnet core)
103+
Write-Host ("Starting embedded tests for netcoreapp3.1") -ForegroundColor "Green"
104+
&$DOTNET_CMD ".\src\embed_tests\bin\netcoreapp3.1_publish\Python.EmbeddingTest.dll"
105105
$CS_STATUS = $LastExitCode
106106
if ($CS_STATUS -ne 0) {
107-
Write-Host "Embedded tests for netcoreapp2.0 failed" -ForegroundColor "Red"
107+
Write-Host "Embedded tests for netcoreapp3.1 failed" -ForegroundColor "Red"
108108
ReportTime ""
109109
} else {
110110
ReportTime ".NET Core 2.0 tests completed"

‎requirements.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# Requirements for both Travis and AppVeyor
2-
pytest==3.2.5
2+
pytest
33
coverage
44
psutil
55

66
# Coverage upload
77
codecov
88

99
# Platform specific requirements
10-
# pip; sys_platform == 'win32'
11-
wheel; sys_platform == 'win32'
12-
pycparser; sys_platform != 'win32'
10+
wheel
11+
pycparser

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def build_extension(self, ext):
351351
cmd
352352
+ [
353353
'"/t:Console_15:publish;Python_EmbeddingTest_15:publish"',
354-
"/p:TargetFramework=netcoreapp2.0",
354+
"/p:TargetFramework=netcoreapp3.1",
355355
]
356356
),
357357
shell=use_shell,

‎src/console/Console.15.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>
55
<Platforms>x64;x86</Platforms>
66
<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>
77
<OutputType>Exe</OutputType>

‎src/console/Console.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<Name>Python.Runtime</Name>
9595
</ProjectReference>
9696
</ItemGroup>
97-
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
97+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
9898
<Target Name="AfterBuild">
9999
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PythonBuildDir)" />
100100
</Target>

‎src/embed_tests/Python.EmbeddingTest.15.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
5+
<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>
66
<Platforms>x64;x86</Platforms>
77
<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>
88
<OutputType Condition="'$(TargetFramework)' != 'net40' OR '$(PYTHONNET_VS_ENV)' == 'true'">Exe</OutputType>
@@ -28,7 +28,7 @@
2828
<CustomDefineConstants Condition="'$(CustomDefineConstants)' == ''">$(PYTHONNET_DEFINE_CONSTANTS)</CustomDefineConstants>
2929
<BaseDefineConstants>XPLAT</BaseDefineConstants>
3030
<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>
31-
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);NETCOREAPP</DefineConstants>
31+
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp3.1'">$(DefineConstants);NETCOREAPP</DefineConstants>
3232
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
3333
<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
3434
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
@@ -87,7 +87,7 @@
8787
</PackageReference>
8888
<PackageReference Include="NUnitLite" Version="3.12.0" />
8989
</ItemGroup>
90-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
90+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
9191
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
9292
</ItemGroup>
9393
<ItemGroup>

‎src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<ItemGroup>
126126
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
127127
</ItemGroup>
128-
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
128+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
129129
<PropertyGroup>
130130
<TargetAssembly>$(TargetPath)</TargetAssembly>
131131
<TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>

0 commit comments

Comments
 (0)