Incorporate DSCPython3 branch updated to .NET 4.8 #10682
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…S#10548) * Initial feasibility study of switching to PythonNET 3.7 * Python evaluator should be selectable per-node based on Engine property of node. * Restore IronPython2 support, make it the default * Update DSCPython project output assembly name * Marshal Python 3 dictionaries correctly * Update Dynamo.All.sln * Interchanging the project GUID's back for DSIronPython and DSIronPython * Adding EndProject tag for the DSCPython project * Fixing the autocomplete for iron python and the tests. * Adding back the IronPython dependent binaries * Update IronPythonTests.csproj * Addressing comments * Removing these references from IronPythonTests project as they are not 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. * Adding back a default csproj file for the DynamoPython so as to not break the binary check sum. * Adding back the DynamoPython project to the Dynamo solution. Co-authored-by: Michael Dewberry <[email protected]>
…amoDS#10596) * Updating PythonNodeModels, PythonNodeModelsWPF to not copy the binaries again. * Setting the private flag for DSCPython project reference to false. * Update PythonNodeModelsWpf.csproj * Removing the commented code.
* Initial Commit to add two options * Add missing commit * Add Debug Setting * Revert "Add Debug Setting" This reverts commit 790c3f9. * Add Click Handler and initial check state * Some UI changes to enable more smooth and consistent UI * Comments * Use Enums instead of static strings * Comments * Comments * CleanUp * Cleanup
* add namespace conflict tests for short name replacer and node to code (DynamoDS#10611) * Register custom node before package load reset (DynamoDS#10591) This fixes a problem where existing custom nodes in the home workspace became unresolved after a package that contained binaries was loaded. The cause of the problem was that the compiled function was not available at the time of the execution after a VM reset. Now the data is registered on package load, by queueing it in pendingCustomNodeSyncData. This results in a CompileCustomNodeAsyncTask being scheduled before the update of the home workspace graph takes place. * Increase coverage of the Core folder (DynamoDS#10609) * Add a test for the CrashPromptArgs class * Update DynamoCoreTests.csproj * Added NotificationObject tests * Updated the test, NotificationObject coverage at 100% * Changed some access modifiers * Added coverage for Updates/BinaryVersion * Added comments and fixed names * Revert "Added comments and fixed names" This reverts commit 42cd024. * Revert "Added coverage for Updates/BinaryVersion" This reverts commit 679deca. * Increased coverage in CrashPromptArgs * Added some Core coverage * DYN-2560 - Increase the code coverage: DynamoCore/Models Folder First Part (DynamoDS#10612) * DYN-2560 - Increase the code coverage: DynamoCore/Models Folder I started adding just one test method TestOnRequestDispatcherBeginInvoke() for testing the DynamoModelEvents class. * DYN-2560 - Adding test cases for DynamoModelEvents Adding test cases for DynamoModelEvents * DYN-2560 - Adding test cases for DynamoModelEvents I added all the test cases for the all events in the DynamoModelEvent class, i just need to fix the last 6 of them. * DYN-2560 - Adding test cases for DynamoModelEventsArgs I added several test cases for the classes inside the DynamoModelEventsArgs.cs file. ZoomEventArgs TaskDialogEventArgs EvaluationCompletedEventArgs DynamoModelUpdateArgs FunctionNamePromptEventArgs PresetsNamePromptEventArgs ViewOperationEventArgs PointEventArgs WorkspaceEventArgs ModelEventArgs * DYN-2560 - Code Review Comments Based in the comment done by Aaron in the GitHub pull request, I added more description comments for the method TestTaskDialogEventArgs() and also I added comments for a local function * DYN-2560 - Code Review Comments 2 There was a spelling error in two methods for the word "Internally", then I fixed this error in the two places. * Python Engine Enum (DynamoDS#10618) * Cherrypick * Comments * Add unit test * Comments * Handle runtime table gaps on code block deletion (DynamoDS#10605) When the runtime table are built there is an implicit assumption that the code block ids are consecutive. However, that is not always the case, as the deletion of a procedure causes the deletion of its child code blocks, which may generate gaps in the id numbering. In order to make the code resiliant to these gaps, the runtime tables are sized based on the largest code block id, rather than in the amount of code blocks. * Validate ASM installations before loading (DynamoDS#10621) The check for the specific assemblies tbb.dll and tbbmalloc.dll is generalized to a full file list validation of detected ASM locations. This way, Dynamo is guarded against any incomplete/unusual ASM binary folders that other applications might include. The lists of files for each version were taken from LibG. They cannot be reused from LibG without involving major changes in the preloader, so the lists should be kept in sync as new major release of ASM occur. * SQ bug fix (DynamoDS#10622) * (1) Null reference bug fix from SQ dashboard * Add support for debug modes (DynamoDS#10603) * Add support for debug modes * Increase coverage of the Updates folder (DynamoDS#10628) * Add a test for the CrashPromptArgs class * Update DynamoCoreTests.csproj * Added NotificationObject tests * Updated the test, NotificationObject coverage at 100% * Changed some access modifiers * Added coverage for Updates/BinaryVersion * Added comments and fixed names * Added asserts for happy path, changed namespace and deleted a console function * Removed using * Revert "Removed using" This reverts commit 022823d. * Removed a change that should not be there * Added coverage for Updates folder * Tests for CPython3 Engine as well as for IronPython. * [WIP][FEEDBACK] Reduce test time by substantially reducing number of serialization tests. (DynamoDS#10624) * reduce number of serialization tests by factor 3~ * reduce wpf json serialization tests * Handle missing instance calling method statically (DynamoDS#10630) A code block node calling an instance method in its static form would make Dynamo crash if the instance was not provided. An example of this would be calling 'Curve.Patch();'. The cause of the issue was that the default argument was ultimately tried to be interpreted as a pointer. By avoiding that wrong conversion the engine is now able to surface the real problem as a human-readable warning. * Python3 Selection Under Debug Modes (DynamoDS#10629) * Cherrypick Python3 changes * Cleanup * Use Debug Modes * CleanUp * Rename Function * Clean Up * Do not use anouymous function as handler * Revert newer language change * Add adp analytics to Dynamo (DynamoDS#10576) * add ADPTracker register * Fix non-array item search for dot operation (DynamoDS#10633) When an array is passed to the dot operation, it needs to get an item to determine the actual class being processed. This was done in ArrayUtils.GetFirstNonArrayStackValue, but the function only checked the first item of the array and its descendants. This caused the dot operation to failed when passed an array that contained an empty array as its first item. In order to fix the problem, the function was changed to check for non-array items in the entire array. The function should stop as soon as the first non-array item is found. * Addressing some comments * some more comments * Update AssemblyInfo.cs * Update AssemblyInfo.cs * Marking the python node as modified when its engine property is modified Also updated some tests. * Remove unwanted check. * changes to test * Update AssemblySharedInfo.cs * Using python engine's AcquireLock to avoid deadlock. The deadlock was happening only when multiple PythonEngine's are initialized on a thread from 2 different test fixtures in the same run. The main difference is calling this function PythonEngine.BeginAllowThreads(). Also we do not want to initialze the python engine if it is already initialized. Co-authored-by: aparajit-pratap <[email protected]> Co-authored-by: Martin Misol Monzo <[email protected]> Co-authored-by: Bruno Yorda <[email protected]> Co-authored-by: Roberto T <[email protected]> Co-authored-by: Aaron (Qilong) <[email protected]> Co-authored-by: Ashish Aggarwal <[email protected]> Co-authored-by: Tibi <[email protected]> Co-authored-by: Michael Kirschner <[email protected]>
| @@ -30,6 +30,7 @@ public SandboxPathResolver(string preloaderLocation) | |||
| "DSCoreNodes.dll", | |||
| "DSOffice.dll", | |||
| "DSIronPython.dll", | |||
| "DSCPython.dll", | |||
There was a problem hiding this comment.
I guess this should also be added to the CLI path resolver?
There was a problem hiding this comment.
Thanks @mjkkirschner , I will update that. Let me know if you find anything else.
| namespace DSCPython | ||
| { | ||
| [SupressImportIntoVM] | ||
| public enum EvaluationState { Begin, Success, Failed } |
There was a problem hiding this comment.
if this needs to be public can we add summary tags?
If not can we make it internal?
| public enum EvaluationState { Begin, Success, Failed } | ||
|
|
||
| [SupressImportIntoVM] | ||
| public delegate void EvaluationEventHandler(EvaluationState state, |
There was a problem hiding this comment.
same here(public/internal)
|
|
||
| namespace DSCPython | ||
| { | ||
| [SupressImportIntoVM] |
There was a problem hiding this comment.
is this class actually imported into the VM at all?
There was a problem hiding this comment.
I'm not sure about this. Maybe @reddyashish ?
There was a problem hiding this comment.
Yes, the class is imported in the VM but not these internal variables. Similar to what is done in IronPythonEvaluator class.
mjkkirschner
approved these changes
May 19, 2020
|
I'll go ahead and merge this. Hopefully the green build will return soon. |
aparajit-pratap
added a commit
to aparajit-pratap/Dynamo
that referenced
this pull request
May 20, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Changes in this PR:
Declarations
Check these if you believe they are true
*.resxfilesReviewers
@DynamoDS/dynamo