[DYN-2322] Add PythonNet 3.7 CPython as a selectable engine. #10548

reddyashish · 2020-04-07T15:56:03Z

Purpose

This PR is a cloned from the original PR(#10472) by @Dewb.

The auto-completion part for the IronPython is fixed. The IronPythonCompletionData and IronPythonCompletionProvider classes have been moved from the PythonNodeModelsWPF project to the DSIronPython project. We can extend this similarly with the new DSCPython.

There is only one failing test left that is related to function marshaling: FirstClassFunctions

Declarations

Check these if you believe they are true

The codebase is in a better state after this PR
Is documented according to the standards
The level of testing this PR includes is appropriate
User facing strings, if any, are extracted into *.resx files
All tests pass using the self-service CI.
Snapshot of UI changes, if any.
Changes to the API follow Semantic Versioning and are documented in the API Changes document.

Reviewers

@DynamoDS/dynamo

…ty of node.

Still needs to uncomment python autocompletion code and fix one failing test.

src/Dynamo.All.sln

test/Libraries/DynamoPythonTests/IronPythonTests.csproj

mjkkirschner · 2020-04-17T10:58:27Z

We can’t remove these - patch installer yada yada - if you want we can replace them with empty binaries.

…

On Apr 17, 2020, at 2:07 AM, reddyashish ***@***.***> wrote: @reddyashish commented on this pull request. In test/Libraries/DynamoPythonTests/IronPythonTests.csproj: > @@ -46,18 +46,6 @@ <HintPath>..\..\..\src\packages\IronPython.2.7.9\lib\net45\IronPython.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="IronPython.Modules, Version=2.7.9.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL"> Removed these IronPython.Modules, IronPython.SQLLite and IronPython.Wpf binaries as they were not being used. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

mjkkirschner · 2020-04-17T11:06:48Z

Also I am fairly certain ironpython modules is used to include certain parts of the standard modules - like math - they may not be required if the std library we include includes them but I would be wary about these - anything used by ironpython may only have runtime dependencies - not compile time - so if proving it’s not used will be hard.

…

On Apr 17, 2020, at 2:07 AM, reddyashish ***@***.***> wrote: @reddyashish commented on this pull request. In test/Libraries/DynamoPythonTests/IronPythonTests.csproj: > @@ -46,18 +46,6 @@ <HintPath>..\..\..\src\packages\IronPython.2.7.9\lib\net45\IronPython.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="IronPython.Modules, Version=2.7.9.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL"> Removed these IronPython.Modules, IronPython.SQLLite and IronPython.Wpf binaries as they were not being used. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

reddyashish · 2020-04-17T14:35:35Z

@mjkkirschner Yes, will add them back.

src/Libraries/DSIronPython/DSIronPython.csproj

aparajit-pratap · 2020-04-17T15:33:27Z

src/Libraries/DSIronPython/DSIronPython.csproj

+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\property.png" />
+  </ItemGroup>


Any specific reason for moving things from PythonNodeModelsWpf to here?

These property are being used for the auto-completion feature and we have moved all the auto-completion code to the DSIronPython project. The idea was not to have this PythonNodeModelsWPF project directly depend on any python binaries.

mjkkirschner · 2020-04-17T15:40:20Z

src/Libraries/DSIronPython/DSIronPython_DynamoCustomization.xml

-    </assembly>
-    <namespaces>
-        <namespace name="DSIronPython">
-            <category>Core.Scripting</category>


@reddyashish why is this being deleted? This will effect where nodes go in the library won't it?

Not sure where this xml is used but the python node is being saved in the Script -> Editor folder in the library section(same as before).

src/Libraries/DynamoPython/Python.csproj

test/Libraries/DynamoPythonTests/CodeCompletionTests.cs

src/Libraries/DSCPython/CPythonEvaluator.cs

src/Libraries/PythonNodeModels/PythonNode.cs

QilongTang · 2020-04-20T20:31:13Z

Overall looks good to me and fairly safe to merge into the feature branch for our next moves.

I saw there is a binary removed DynamoPython, so we may want to figure out a way to create empty binary for that this year because of the limitation of patch installer.
We can ask BRE to build this branch in the newly setup VMs to see if builds. Seems those VMs already have .NetFramework 4.7.2 installed because it is OOTB with VS2019

@aparajit-pratap @mjkkirschner Any other notes?

…t being used. These binaries are added as reference to the DSIronPython project and the private flag is set to true. So the binaries are being copied to the bin folder.

reddyashish · 2020-04-20T21:00:08Z

src/Libraries/DSIronPython/DSIronPython.csproj

+    <Reference Include="ICSharpCode.AvalonEdit">
+      <HintPath>..\..\..\extern\avalonEdit\ICSharpCode.AvalonEdit.dll</HintPath>
+      <Private>False</Private>
+    </Reference>


@mjkkirschner The IronPython SQL, Modules and WPF binaries are already added as references here to the DSIronPython project and the private flag is set to true. So the binaries are copied to the bin folder.

reddyashish · 2020-04-20T21:02:14Z

@QilongTang Yes, I will add an empty project in place of DynamoPython.

…reak the binary check sum.

QilongTang · 2020-04-21T00:49:32Z

@reddyashish Looks good, can we merge this now?

QilongTang · 2020-04-21T01:38:29Z

@DynamoDS/dynamo I am merging this so that BRE can test branch builds on new VM..

mjkkirschner · 2020-04-23T16:19:40Z

src/Libraries/PythonNodeModelsWpf/PythonNodeModelsWpf.csproj

-    <ProjectReference Include="..\DSIronPython\DSIronPython.csproj">
-      <Project>{9eef4f42-6b3b-4358-9a8a-c2701539a822}</Project>
-      <Name>DSIronPython</Name>
-      <Private>False</Private>


@reddyashish FYI

mike-d-adsk and others added 8 commits November 25, 2019 20:15

Initial feasibility study of switching to PythonNET 3.7

f9afa12

Merge branch 'master' into python3-spike

9264f36

Python evaluator should be selectable per-node based on Engine proper…

5b71184

…ty of node.

Restore IronPython2 support, make it the default

e5698b1

Update DSCPython project output assembly name

fd462e1

Merge remote-tracking branch 'origin' into python3-spike

c395792

Marshal Python 3 dictionaries correctly

dedb3df

First commit

7a6bb63

Still needs to uncomment python autocompletion code and fix one failing test.

reddyashish added the WIP label Apr 7, 2020

Update Dynamo.All.sln

65f081f

mjkkirschner reviewed Apr 7, 2020

View reviewed changes

src/Dynamo.All.sln Outdated Show resolved Hide resolved

reddyashish added 2 commits April 7, 2020 19:00

Interchanging the project GUID's back for DSIronPython and DSIronPython

335cd28

Adding EndProject tag for the DSCPython project

9c70e28

reddyashish commented Apr 7, 2020

View reviewed changes

src/Dynamo.All.sln Show resolved Hide resolved

reddyashish changed the base branch from master to DSCPython3 April 16, 2020 18:47

Fixing the autocomplete for iron python and the tests.

230329c

reddyashish requested review from QilongTang, aparajit-pratap and Dewb April 17, 2020 06:01

reddyashish commented Apr 17, 2020

View reviewed changes

test/Libraries/DynamoPythonTests/IronPythonTests.csproj Show resolved Hide resolved

reddyashish changed the title ~~[WIP] [DYN-2322] Add PythonNet 3.7 CPython as a selectable engine.~~ [DYN-2322] Add PythonNet 3.7 CPython as a selectable engine. Apr 17, 2020

reddyashish added 2 commits April 17, 2020 10:36

Adding back the IronPython dependent binaries

eba298d

Update IronPythonTests.csproj

1a9d2f3

aparajit-pratap reviewed Apr 17, 2020

View reviewed changes

src/Libraries/DSIronPython/DSIronPython.csproj Show resolved Hide resolved

aparajit-pratap reviewed Apr 17, 2020

View reviewed changes

mjkkirschner reviewed Apr 17, 2020

View reviewed changes

src/Libraries/DynamoPython/Python.csproj Outdated Show resolved Hide resolved

aparajit-pratap reviewed Apr 17, 2020

View reviewed changes

test/Libraries/DynamoPythonTests/CodeCompletionTests.cs Outdated Show resolved Hide resolved

aparajit-pratap reviewed Apr 17, 2020

View reviewed changes

Dewb mentioned this pull request Apr 20, 2020

Add Engine property to PythonNodeBase #10584

Closed

6 tasks

Addressing comments

9e1e614

Removing these references from IronPythonTests project as they are no…

3035981

…t being used. These binaries are added as reference to the DSIronPython project and the private flag is set to true. So the binaries are being copied to the bin folder.

reddyashish commented Apr 20, 2020

View reviewed changes

reddyashish added 2 commits April 20, 2020 20:20

Adding back a default csproj file for the DynamoPython so as to not b…

07adb85

…reak the binary check sum.

Adding back the DynamoPython project to the Dynamo solution.

f4cab40

QilongTang merged commit c853363 into DynamoDS:DSCPython3 Apr 21, 2020

mjkkirschner reviewed Apr 23, 2020

View reviewed changes

Dewb mentioned this pull request Apr 23, 2020

WIP: support Python 3 evaluation engine #10472

Closed

10 tasks

reddyashish mentioned this pull request Apr 24, 2020

Fixing some of the issues for PythonNet3.7 on DSCPython3 branch. #10596

Merged

7 tasks

QilongTang added LGTM Looks good to me and removed WIP labels Apr 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DYN-2322] Add PythonNet 3.7 CPython as a selectable engine. #10548

[DYN-2322] Add PythonNet 3.7 CPython as a selectable engine. #10548

reddyashish commented Apr 7, 2020 •

edited

Loading

mjkkirschner commented Apr 17, 2020 via email

mjkkirschner commented Apr 17, 2020 via email

reddyashish commented Apr 17, 2020

aparajit-pratap Apr 17, 2020

reddyashish Apr 20, 2020

mjkkirschner Apr 17, 2020 •

edited

Loading

reddyashish Apr 20, 2020

QilongTang commented Apr 20, 2020 •

edited

Loading

reddyashish Apr 20, 2020

reddyashish commented Apr 20, 2020

QilongTang commented Apr 21, 2020

QilongTang commented Apr 21, 2020 •

edited

Loading

mjkkirschner Apr 23, 2020

[DYN-2322] Add PythonNet 3.7 CPython as a selectable engine. #10548

[DYN-2322] Add PythonNet 3.7 CPython as a selectable engine. #10548

Conversation

reddyashish commented Apr 7, 2020 • edited Loading

Purpose

Declarations

Reviewers

mjkkirschner commented Apr 17, 2020 via email

mjkkirschner commented Apr 17, 2020 via email

reddyashish commented Apr 17, 2020

aparajit-pratap Apr 17, 2020

Choose a reason for hiding this comment

reddyashish Apr 20, 2020

Choose a reason for hiding this comment

mjkkirschner Apr 17, 2020 • edited Loading

Choose a reason for hiding this comment

reddyashish Apr 20, 2020

Choose a reason for hiding this comment

QilongTang commented Apr 20, 2020 • edited Loading

reddyashish Apr 20, 2020

Choose a reason for hiding this comment

reddyashish commented Apr 20, 2020

QilongTang commented Apr 21, 2020

QilongTang commented Apr 21, 2020 • edited Loading

mjkkirschner Apr 23, 2020

Choose a reason for hiding this comment

reddyashish commented Apr 7, 2020 •

edited

Loading

mjkkirschner Apr 17, 2020 •

edited

Loading

QilongTang commented Apr 20, 2020 •

edited

Loading

QilongTang commented Apr 21, 2020 •

edited

Loading