Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
eirannejad committed Feb 2, 2021
2 parents 92cb346 + 193c6e2 commit 6f3e004
Show file tree
Hide file tree
Showing 285 changed files with 4,394 additions and 1,499 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,7 @@ dist/
!.vscode/.ropeproject/config.py

# resilio sync
.sync
.sync

# misc
.idea
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "dev/modules/pyRevitLabs.Python.Net"]
path = dev/modules/pyRevitLabs.Python.Net
url = https://github.com/pyrevitlabs/pythonnet.git
[submodule "dev/modules/pyRevitLabs.dlr"]
path = dev/modules/pyRevitLabs.dlr
url = https://github.com/pyrevitlabs/dlr.git
[submodule "dev/modules/pyRevitLabs.ironpython2"]
path = dev/modules/pyRevitLabs.ironpython2
url = https://github.com/pyrevitlabs/ironpython2.git
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pygount = "*"
pyyaml = "*"

[requires]
python_version = "3.8"
python_version = "3.9"

[pipenv]
allow_prereleases = true
Expand Down
188 changes: 106 additions & 82 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ Check the list of [Currently Open](https://github.com/eirannejad/pyRevit/issues)

**</>** with 🖤 in [Portland](https://en.m.wikipedia.org/wiki/Portland,_Oregon), Oregon

Copyright 2014-2020 by Ehsan Iran-Nejad (pyrevitlabs.io) - All Rights Reserved
Copyright © 2014-2021 by Ehsan Iran-Nejad (pyrevitlabs.io) - All Rights Reserved

No part of this publication may be reproduced, distributed, or transmitted in any form or by any means, including photocopying, recording, or other electronic or mechanical methods, without the prior written permission of the publisher.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file added bin/engines/IPY2711PR/Mono.Posix.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/engines/IPY2711PR/pyRevitLabs.IronPython.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/engines/IPY2711PR/pyRevitLoader.dll
Binary file not shown.
Binary file added bin/engines/IPY2711PR/pyRevitRunner.dll
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file modified bin/pyRevitLabs.Common.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.CommonCLI.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.CommonWPF.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.DeffrelDB.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.Emojis.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.Json.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.Language.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.MahAppsMetro.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.NLog.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.PyRevit.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.TargetApps.AutoCAD.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.TargetApps.Navisworks.dll
Binary file not shown.
Binary file modified bin/pyRevitLabs.TargetApps.Revit.dll
Binary file not shown.
Binary file modified bin/pyrevit-autocomplete.exe
Binary file not shown.
Binary file modified bin/pyrevit-doctor.exe
Binary file not shown.
12 changes: 12 additions & 0 deletions bin/pyrevit-hosts.json
Original file line number Diff line number Diff line change
Expand Up @@ -1354,5 +1354,17 @@
"build": "20200909_1515",
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_2021_1_1_html"
},
{
"meta": {
"schema": "1.0",
"source": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_html"
},
"product": "Autodesk Revit",
"release": "2021.1.2",
"version": "21.1.20.44",
"build": "20201109_1530",
"target": "x64",
"notes": "https://help.autodesk.com/view/RVT/2021/ENU/?guid=RevitReleaseNotes_2021updates_html"
}
]
12 changes: 12 additions & 0 deletions bin/pyrevit-products.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[
{
"product": "pyRevit",
"release": "4.8.5",
"version": "4.8.5",
"key": "{F13EA93D-4DB1-4149-A86A-B0EFE54ED6AC}"
},
{
"product": "pyRevit",
"release": "4.8.4",
Expand Down Expand Up @@ -215,6 +221,12 @@
"version": "4.6.1",
"key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
},
{
"product": "pyRevit CLI",
"release": "4.8.5",
"version": "4.8.5",
"key": "{AA15AF8E-2D65-40EF-A9E6-C920D83984E0}"
},
{
"product": "pyRevit CLI",
"release": "4.8.4",
Expand Down
Binary file modified bin/pyrevit-stubsbuilder.exe
Binary file not shown.
Binary file modified bin/pyrevit-telemetryserver.exe
Binary file not shown.
Binary file modified bin/pyrevit-toast.exe
Binary file not shown.
Binary file modified bin/pyrevit.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion dev/_autocomplete.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,5 +224,5 @@ def build_autocmp(_: Dict[str, str]):
target = op.abspath(configs.AUTOCOMPBIN)
utils.system(["go", "fmt", configs.AUTOCOMP])
utils.system(["go", "build", "-o", target, configs.AUTOCOMP])
print("Building autocomplete utility succompleted successfully")
print("Building autocomplete utility completed successfully")
os.remove(configs.AUTOCOMP)
8 changes: 7 additions & 1 deletion dev/_changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ def title(self):
ChangeGroup(tag="cli", header="Command Line Utility"),
ChangeGroup(tag="bundles", header="Script bundles"),
ChangeGroup(tag="tele", header="Telemetry"),
ChangeGroup(tag="exts", header="Extensions"),
ChangeGroup(tag="hook", header="Extension Hooks"),
ChangeGroup(tag="command", header="Extension Commands"),
ChangeGroup(tag="api", header="API"),
ChangeGroup(tag="", header="Misc Changes"),
]
Expand All @@ -117,7 +120,8 @@ def find_changes(gitlog_report: str):
changes = []
idx = 0
changelines = gitlog_report.split("\n")
while idx < len(changelines):
report_length = len(changelines)
while idx < report_length:
# extract hash and message
cline = changelines[idx]
chash, cmsg = cline.split(" ", 1)
Expand All @@ -129,6 +133,8 @@ def find_changes(gitlog_report: str):
while not cline.startswith("/"):
ccmt += cline
idx += 1
if idx >= report_length:
break
cline = changelines[idx]
# add a new change
changes.append(
Expand Down
1 change: 1 addition & 0 deletions dev/_labs.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def _build(name: str, sln: str, config: str):

def build_engines(_: Dict[str, str]):
"""Build pyRevit engines"""
_build("default ironpython engine", configs.LOADERS, "Release")
_build("ironpython 2.7.* engines", configs.LOADERS, "Release")
_build("cpython 3.7 engine", configs.CPYTHONRUNTIME, "ReleasePY37")
_build("cpython 3.8 engine", configs.CPYTHONRUNTIME, "ReleasePY38")
Expand Down
4 changes: 2 additions & 2 deletions dev/_telem.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def build_telem(args: Dict[str, str]):

print("Updating telemetry server dependencies...")
report = utils.system(
["go", "get", "-d", r".\..."],
["go", "get", r"./..."],
cwd=op.abspath(configs.TELEMETRYSERVERPATH),
)
if report:
Expand All @@ -60,7 +60,7 @@ def build_telem(args: Dict[str, str]):
["go", "build", "-o", output_bin, op.abspath(configs.TELEMETRYSERVER)],
cwd=op.abspath(configs.TELEMETRYSERVERPATH),
)
print("Building telemetry server succompleted successfully")
print("Building telemetry server completed successfully")


def start_telem(_: Dict[str, str]):
Expand Down
53 changes: 53 additions & 0 deletions dev/modules/pyRevitLabs.IronPython2.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLR", "DLR", "{BF166365-161B-405B-9673-1D5846C7F600}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dynamic", "pyRevitLabs.dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{635343DA-4FE9-4696-92B2-87EDE708D316}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting", "pyRevitLabs.dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj", "{CCF80500-3EFF-4546-A858-5CA5CC684EDF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting.Metadata", "pyRevitLabs.dlr\Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{FF6F5F89-5468-45A2-9D55-481A77128067}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython", "pyRevitLabs.ironpython2\Src\IronPython\IronPython.csproj", "{0C9A4EEF-A3C5-4B08-AD38-39E5D618AE16}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "pyRevitLabs.ironpython2\Src\IronPython.Modules\IronPython.Modules.csproj", "{4FB2A3BB-4D9F-4C59-AF3A-C6C0B36F5E4F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.SQLite", "pyRevitLabs.ironpython2\Src\IronPython.SQLite\IronPython.SQLite.csproj", "{CC1EA53F-62BC-4A5B-9770-9E7840AB711C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "pyRevitLabs.ironpython2\Src\IronPython.Wpf\IronPython.Wpf.csproj", "{980049B3-806E-4ADF-8DF1-C8B0C2E81CD3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{635343DA-4FE9-4696-92B2-87EDE708D316}.Release|Any CPU.ActiveCfg = Release|Any CPU
{635343DA-4FE9-4696-92B2-87EDE708D316}.Release|Any CPU.Build.0 = Release|Any CPU
{CCF80500-3EFF-4546-A858-5CA5CC684EDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCF80500-3EFF-4546-A858-5CA5CC684EDF}.Release|Any CPU.Build.0 = Release|Any CPU
{FF6F5F89-5468-45A2-9D55-481A77128067}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF6F5F89-5468-45A2-9D55-481A77128067}.Release|Any CPU.Build.0 = Release|Any CPU
{0C9A4EEF-A3C5-4B08-AD38-39E5D618AE16}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C9A4EEF-A3C5-4B08-AD38-39E5D618AE16}.Release|Any CPU.Build.0 = Release|Any CPU
{4FB2A3BB-4D9F-4C59-AF3A-C6C0B36F5E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FB2A3BB-4D9F-4C59-AF3A-C6C0B36F5E4F}.Release|Any CPU.Build.0 = Release|Any CPU
{CC1EA53F-62BC-4A5B-9770-9E7840AB711C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC1EA53F-62BC-4A5B-9770-9E7840AB711C}.Release|Any CPU.Build.0 = Release|Any CPU
{980049B3-806E-4ADF-8DF1-C8B0C2E81CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{980049B3-806E-4ADF-8DF1-C8B0C2E81CD3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{635343DA-4FE9-4696-92B2-87EDE708D316} = {BF166365-161B-405B-9673-1D5846C7F600}
{CCF80500-3EFF-4546-A858-5CA5CC684EDF} = {BF166365-161B-405B-9673-1D5846C7F600}
{FF6F5F89-5468-45A2-9D55-481A77128067} = {BF166365-161B-405B-9673-1D5846C7F600}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D8BF46F0-D963-42E1-8F59-FDEFCEAEA7E0}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion dev/modules/pyRevitLabs.Python.Net
25 changes: 25 additions & 0 deletions dev/modules/pyRevitLabs.Python.Net.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "pyRevitLabs.Python.Net\src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
ReleasePY37|Any CPU = ReleasePY37|Any CPU
ReleasePY38|Any CPU = ReleasePY38|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleasePY37|Any CPU.ActiveCfg = ReleasePY37|Any CPU
{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleasePY37|Any CPU.Build.0 = ReleasePY37|Any CPU
{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleasePY38|Any CPU.ActiveCfg = ReleasePY38|Any CPU
{097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleasePY38|Any CPU.Build.0 = ReleasePY38|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {40B7E651-20D3-4115-9987-245A90CFFC30}
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions dev/modules/pyRevitLabs.dlr
Submodule pyRevitLabs.dlr added at 42f4eb
1 change: 1 addition & 0 deletions dev/modules/pyRevitLabs.ironpython2
2 changes: 1 addition & 1 deletion dev/pyRevit/AssemblyCopyright.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;

[assembly: AssemblyCopyright("Copyright © 2014-2020")]
[assembly: AssemblyCopyright("Copyright © 2014-2021")]
[assembly: AssemblyCompany("pyRevitLabs.io")]
4 changes: 2 additions & 2 deletions dev/pyRevit/AssemblyVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;

[assembly: AssemblyVersion("4.8.4")]
[assembly: AssemblyFileVersion("4.8.4")]
[assembly: AssemblyVersion("4.8.5")]
[assembly: AssemblyFileVersion("4.8.5")]
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\IronRubyEngine.cs">
<Link>Engines\IronRubyEngine.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\UpdaterListener.cs">
<Link>Services\UpdaterListener.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\JournalListener.cs">
<Link>Services\JournalListener.cs</Link>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\IronRubyEngine.cs">
<Link>Engines\IronRubyEngine.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\UpdaterListener.cs">
<Link>Services\UpdaterListener.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\JournalListener.cs">
<Link>Services\JournalListener.cs</Link>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\IronRubyEngine.cs">
<Link>Engines\IronRubyEngine.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\UpdaterListener.cs">
<Link>Services\UpdaterListener.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\JournalListener.cs">
<Link>Services\JournalListener.cs</Link>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@
<Compile Include="..\..\..\pyrevitlib\pyrevit\runtime\IronRubyEngine.cs">
<Link>Engines\IronRubyEngine.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\UpdaterListener.cs">
<Link>Services\UpdaterListener.cs</Link>
</Compile>
<Compile Include="..\..\..\pyrevitlib\pyrevit\runtime\JournalListener.cs">
<Link>Services\JournalListener.cs</Link>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\IronRubyEngine.cs">
<Link>Engines\IronRubyEngine.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\UpdaterListener.cs">
<Link>Services\UpdaterListener.cs</Link>
</Compile>
<Compile Include="..\..\pyrevitlib\pyrevit\runtime\JournalListener.cs">
<Link>Services\JournalListener.cs</Link>
</Compile>
Expand Down
Loading

0 comments on commit 6f3e004

Please sign in to comment.