Skip to content

Codecs: customize set of Py<->C# conversions via PyObjectConversions #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lostmsu merged 17 commits into from
Feb 26, 2020
Merged

Codecs: customize set of Py<->C# conversions via PyObjectConversions #1022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
28143d5
enable expanding set of marshaling conversions via PyObjectConversions
lostmsu Sep 12, 2019
6eca169
fixed ConversionsObject test failing due to sequence to array convers…
lostmsu Jan 16, 2020
97e33c7
attempt to fix CI build issue with ValueTuple under Mono
lostmsu Jan 16, 2020
449338f
added RefereneAssemblies package reference to fix CI build
lostmsu Jan 30, 2020
39b2347
marked the new codecs API as unstable
lostmsu Feb 1, 2020
daa2901
attempt to fix PyScopeTest.TestThread() reading stale value from res …
lostmsu Feb 1, 2020
e8e3b4b
Merge branch 'master' into PR/Codecs
lostmsu Feb 13, 2020
8818610
Merge branch 'master' into PR/Codecs
filmor Feb 13, 2020
82f6b99
Merge branch 'master' into PR/Codecs
lostmsu Feb 21, 2020
ec98209
fixed bad IncRef after PyTuple_New
lostmsu Feb 21, 2020
50a3822
corrected reference counting in Codecs
lostmsu Feb 21, 2020
2e19f2c
don't dispose encoded object in case codec keeps a cache of them
lostmsu Feb 21, 2020
44bfec2
Merge branch 'master' into PR/Codecs
filmor Feb 23, 2020
399ae54
do not dispose object, that might have been just decoded succesfully,…
lostmsu Feb 23, 2020
e2d3333
remove incref for tuple fields, as Converter.ToPython is supposed to …
lostmsu Feb 23, 2020
5619fb9
Merge branch 'master' into PR/Codecs
filmor Feb 25, 2020
41de69d
Merge branch 'master' into PR/Codecs
lostmsu Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into PR/Codecs
  • Loading branch information
@filmor @lostmsu
filmor authored and lostmsu committed Feb 25, 2020
commit 5619fb96f5f79194642acc1f8280be39742dc350
11 changes: 7 additions & 4 deletions src/embed_tests/Python.EmbeddingTest.15.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,14 @@


<ItemGroup>
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.7.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
<PackageReference Include="NUnitLite" Version="3.7.2" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnitLite" Version="3.12.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/embed_tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.7.1" targetFramework="net40" />
<package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net40" />
<package id="NUnit" version="3.12.0" targetFramework="net40" />
<package id="NUnit.ConsoleRunner" version="3.11.1" targetFramework="net40" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net40" />
</packages>
</packages>
7 changes: 3 additions & 4 deletions src/perf_tests/Python.PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="pythonnet" Version="2.3.0" GeneratePathProperty="true">
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.