Skip to content

Commit dfba692

Browse files
twastvedtGitHub Enterprise
authored andcommitted
Revert wheels inclusion. (#8)
1 parent 7ef46d4 commit dfba692

24 files changed

+8
-241
lines changed

DSPythonNet3/DSPythonNet3.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,19 @@
88
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
99
</PropertyGroup>
1010
<ItemGroup>
11+
<Reference Include="Python.Deployment">
12+
<HintPath>..\extern\Python\Python.Deployment.dll</HintPath>
13+
<Private>True</Private>
14+
</Reference>
15+
<Reference Include="Python.Included">
16+
<HintPath>..\extern\Python\Python.Included.dll</HintPath>
17+
<Private>True</Private>
18+
</Reference>
1119
<InternalsVisibleTo Include="PythonMigrationViewExtension" />
1220
<InternalsVisibleTo Include="DynamoPythonTests" />
1321

1422
<PackageReference Include="DynamoVisualProgramming.Core" Version="$(DynamoPackageVersion)" ExcludeAssets="runtime" />
1523
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="$(DynamoPackageVersion)" ExcludeAssets="runtime" />
16-
<PackageReference Include="Python.Included" Version="3.11.6" />
1724
<PackageReference Include="pythonnet" Version="3.1.0-preview-ADSK-*" />
1825
</ItemGroup>
1926
<ItemGroup>
@@ -38,9 +45,6 @@
3845
<LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
3946
</EmbeddedResource>
4047
</ItemGroup>
41-
<ItemGroup>
42-
<ProjectReference Include="..\DSPythonNet3Wheels\DSPythonNet3Wheels.csproj" />
43-
</ItemGroup>
4448
<ItemGroup>
4549
<None Update="pkg.json">
4650
<TargetPath>..\%(Filename)%(Extension)</TargetPath>

DSPythonNet3/DSPythonNet3Evaluator.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,6 @@ internal static async Task InstallPythonAsync()
346346
}
347347

348348
await Python.Included.Installer.SetupPython();
349-
350-
Assembly wheelsAssembly = Assembly.LoadFile(Path.Join(Path.GetDirectoryName(Assembly.GetAssembly(typeof(DSPythonNet3Evaluator)).Location), "DSPythonNet3Wheels.dll") );
351-
await Task.WhenAll(wheelsAssembly.GetManifestResourceNames().Where(x => x.Contains(".whl")).Select(wheel => Python.Included.Installer.InstallWheel(wheelsAssembly, wheel)));
352-
353349
isPythonInstalled = true;
354350
}
355351
catch (Exception e)

DSPythonNet3Wheels/DSPythonNet3Wheels.csproj

Lines changed: 0 additions & 16 deletions
This file was deleted.
Binary file not shown.
-8.13 KB
Binary file not shown.
-17.6 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-12.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)