Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.401" />
<PackageVersion Include="pythonnet" Version="3.1.0" />
<PackageVersion Include="pythonnet" Version="3.2.0" />
<PackageVersion Include="System.Buffers" Version="4.6.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.12" />
<PackageVersion Include="System.Data.Common" Version="4.3" />
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if [ -z "${PYTHON:-}" ]; then
fi
fi
if [ "$(uname)" = "Linux" ]; then
${PYTHON} -m venv create arrow-dotnet-dev
${PYTHON} -m venv arrow-dotnet-dev

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated drive-by fix: venv doesn't have a create command, this was actually creating two venvs, one named create and one named arrow-dotnet-dev

# shellcheck source=/dev/null
. arrow-dotnet-dev/bin/activate
python3 -m pip install pyarrow find-libpython
Expand Down
2 changes: 0 additions & 2 deletions test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<PropertyGroup>
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- Required for PythonNET -->
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
</PropertyGroup>

<PropertyGroup Condition="'$(IsWindows)'=='true'">
Expand Down
4 changes: 4 additions & 0 deletions test/Apache.Arrow.Tests/PythonNetFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ public PythonNetFixture()
return;
}

// Disable stashing the Python.NET runtime on shutdown.
// This is only required if we reload the runtime in the same process.
RuntimeData.FormatterType = typeof(NoopFormatter);

try
{
PythonEngine.Initialize();
Expand Down
Loading