Merge pull request #2345 from pyrevitlabs/revert-docs-merge

Revert docs merge
pyrevitlabs · Aug 14, 2024 · 807907d · 807907d
2 parents 35f6eda + 2510c76
commit 807907d
Show file tree

Hide file tree

Showing 107 changed files with 848 additions and 373 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: pyrevit
-open_collective: # Replace with a single Open Collective username
+patreon: # pyrevit
+open_collective: pyrevitlabs
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,16 +7,18 @@ updates:
       # Check for npm updates on Sundays
       day: "sunday"
     # Raise pull requests for version updates
-    # to pip against the `develop-4` branch
-    target-branch: "develop-4"
+    # to pip against the `develop` branch
+    target-branch: "develop"
   - package-ecosystem: "gomod"
     # directory required https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#vendor
     directory: "/"
-    target-branch: "develop-4"
+    target-branch: "develop"
     schedule:
       interval: "monthly"
     # Set update schedule for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      # Check for updates to GitHub Actions every week
+      interval: "monthly"
+    target-branch: "develop"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,14 +3,14 @@ on:
   # when PRs from forked repos are merged
   push:
     branches:
-      - develop-4
-=========
-  # eirannejad 02/12/2024: disabled develop ci/cd builds for pyRevit 5
-  # we will reactivate when changes are ready to build on every commit
-  # push:
-    # branches:
-    #   - develop
->>>>>>>>> Temporary merge branch 2
+      - develop
+    paths:
+      - 'bin/**'
+      - 'dev/**'
+      - 'extensions/**'
+      - 'pyrevitlib/**'
+      - 'release/**'
+      - 'site-packages/**'
   # when PR from develop->master is created
   pull_request:
     branches:
@@ -31,7 +31,6 @@ env:
 
 jobs:
   build:
-    if: github.repository == 'eirannejad/pyRevit'
     runs-on: windows-latest
     steps:
       - name: Report Context
@@ -50,10 +49,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ github.head_ref }}
-
-      - name: Checkout Submodules
-        uses: snickerbockers/submodules-init@7ce9774442c0c2d4728e6d3f66141df2102e4cbc
+          submodules: recursive
 
       - name: Prepare Python 3.10
         uses: actions/setup-python@v5
@@ -190,8 +186,8 @@ jobs:
 
       - name: Publish Release (Release)
         id: publish_release
-        if: (github.base_ref == env.ReleaseBranch)
-        uses: softprops/action-gh-release@v1
+        if: (github.base_ref == env.ReleaseBranch && github.repository == env.MainRepo)
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.gitignore b/.gitignore
@@ -11,13 +11,13 @@ extensions/*
 !extensions/extensions.json
 !extensions/README.md
 !extensions/pyRevitBundlesCreatorExtension.extension/
-bin/*
-!bin/engines
-!bin/pyrevit.svg
-!bin/pyrevit_outputwindow.png
-!bin/pyrevit_settings.png
-!bin/pyrevit-hosts.json
-!bin/pyrevit-products.json
+#bin/*
+#!bin/engines
+#!bin/pyrevit.svg
+#!bin/pyrevit_outputwindow.png
+#!bin/pyrevit_settings.png
+#!bin/pyrevit-hosts.json
+#!bin/pyrevit-products.json
 
 # ignore visual studio files
 **/.vs

diff --git a/Pipfile b/Pipfile
@@ -14,7 +14,7 @@ requests = "*"
 pygount = "*"
 pyyaml = ">=5.4"
 black = "*"
-setuptools = "==69.0.3"
+setuptools = "==72.1.0"
 mkdocs = "*"
 mkdocstrings = "*"
 mkdocstrings-python = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/bin/Colorful.Console.dll b/bin/Colorful.Console.dll
diff --git a/bin/ControlzEx.dll b/bin/ControlzEx.dll
diff --git a/bin/DocoptNet.dll b/bin/DocoptNet.dll
diff --git a/bin/DotNetVersionFinder.dll b/bin/DotNetVersionFinder.dll
diff --git a/bin/FileFormatWavefront.dll b/bin/FileFormatWavefront.dll
diff --git a/bin/Ifc.NET.XmlSerializers.dll b/bin/Ifc.NET.XmlSerializers.dll
diff --git a/bin/Ifc.NET.dll b/bin/Ifc.NET.dll
diff --git a/bin/Ifc.NET.resources.dll b/bin/Ifc.NET.resources.dll
diff --git a/bin/IxMilia.Dxf.dll b/bin/IxMilia.Dxf.dll
diff --git a/bin/LibGit2Sharp.dll b/bin/LibGit2Sharp.dll
diff --git a/bin/MadMilkman.Ini.dll b/bin/MadMilkman.Ini.dll
diff --git a/bin/Microsoft.CodeAnalysis.CSharp.dll b/bin/Microsoft.CodeAnalysis.CSharp.dll
diff --git a/bin/Microsoft.CodeAnalysis.VisualBasic.dll b/bin/Microsoft.CodeAnalysis.VisualBasic.dll
diff --git a/bin/Microsoft.CodeAnalysis.dll b/bin/Microsoft.CodeAnalysis.dll
diff --git a/bin/Microsoft.WindowsAPICodePack.Shell.dll b/bin/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/bin/Microsoft.WindowsAPICodePack.dll b/bin/Microsoft.WindowsAPICodePack.dll
diff --git a/bin/Microsoft.Xaml.Behaviors.dll b/bin/Microsoft.Xaml.Behaviors.dll
diff --git a/bin/Nett.dll b/bin/Nett.dll
diff --git a/bin/OpenMcdf.dll b/bin/OpenMcdf.dll
diff --git a/bin/PythonStubsBuilder.dll b/bin/PythonStubsBuilder.dll
diff --git a/bin/Rhino3dmIO.dll b/bin/Rhino3dmIO.dll
diff --git a/bin/System.Collections.Immutable.dll b/bin/System.Collections.Immutable.dll
diff --git a/bin/System.Memory.dll b/bin/System.Memory.dll
diff --git a/bin/System.Numerics.Vectors.dll b/bin/System.Numerics.Vectors.dll
diff --git a/bin/System.Reflection.Metadata.dll b/bin/System.Reflection.Metadata.dll
diff --git a/bin/System.Runtime.CompilerServices.Unsafe.dll b/bin/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/bin/System.Text.Encoding.CodePages.dll b/bin/System.Text.Encoding.CodePages.dll
diff --git a/bin/System.Threading.Tasks.Extensions.dll b/bin/System.Threading.Tasks.Extensions.dll
diff --git a/bin/System.Windows.Interactivity.dll b/bin/System.Windows.Interactivity.dll
diff --git a/bin/YamlDotNet.dll b/bin/YamlDotNet.dll
diff --git a/bin/git2-a2bde63.dll b/bin/git2-a2bde63.dll
diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
diff --git a/bin/pyRevitLabs.CommonWPF.dll b/bin/pyRevitLabs.CommonWPF.dll
diff --git a/bin/pyRevitLabs.DeffrelDB.dll b/bin/pyRevitLabs.DeffrelDB.dll
diff --git a/bin/pyRevitLabs.Emojis.dll b/bin/pyRevitLabs.Emojis.dll
diff --git a/bin/pyRevitLabs.Json.dll b/bin/pyRevitLabs.Json.dll
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
diff --git a/bin/pyRevitLabs.MahAppsMetro.dll b/bin/pyRevitLabs.MahAppsMetro.dll
diff --git a/bin/pyRevitLabs.NLog.dll b/bin/pyRevitLabs.NLog.dll
diff --git a/bin/pyRevitLabs.PyRevit.Runtime.Shared.dll b/bin/pyRevitLabs.PyRevit.Runtime.Shared.dll
diff --git a/bin/pyRevitLabs.PyRevit.dll b/bin/pyRevitLabs.PyRevit.dll
diff --git a/bin/pyRevitLabs.TargetApps.AutoCAD.dll b/bin/pyRevitLabs.TargetApps.AutoCAD.dll
diff --git a/bin/pyRevitLabs.TargetApps.Navisworks.dll b/bin/pyRevitLabs.TargetApps.Navisworks.dll
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
diff --git a/bin/pyRevitLabs.UnitTests.dll b/bin/pyRevitLabs.UnitTests.dll
diff --git a/bin/pyrevit-autocomplete.exe b/bin/pyrevit-autocomplete.exe
diff --git a/bin/pyrevit-doctor.exe b/bin/pyrevit-doctor.exe
diff --git a/bin/pyrevit-hosts.json b/bin/pyrevit-hosts.json
@@ -1809,7 +1809,19 @@
         "version": "23.1.40.56",
         "build": "20240411_0945",
         "target": "x64",
-        "notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_3_html"
+        "notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_4_html"
+    },
+	    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_5_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "23.1.5",
+        "version": "23.1.50.23",
+        "build": "20240709_1030",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2023/ENU/?guid=RevitReleaseNotes_2023updates_2023_1_5_html"
     },
     {
         "meta": {
@@ -1882,5 +1894,53 @@
         "build": "20231029_1515",
         "target": "x64",
         "notes": "https://help.autodesk.com/view/RVT/2024/ENU/?guid=RevitReleaseNotes_2024updates_2024_2_html"
+    },
+	{
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2024/ENU/?guid=RevitReleaseNotes_2024updates_2024_2_1_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "24.2.1",
+        "version": "24.2.10.64",
+        "build": "20240408_1515",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2024/ENU/?guid=RevitReleaseNotes_2024updates_2024_2_1_html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2025/ENU/?guid=RevitReleaseNotes_2025release_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "Autodesk Revit 2025",
+        "version": "25.0.2.419",
+        "build": "20240307_1300",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2025/ENU/?guid=RevitReleaseNotes_2025release_html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2025/ENU/?guid=RevitReleaseNotes_2025updates_2025_1_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "2025.1",
+        "version": "25.1.0.44",
+        "build": "20240516_1515",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2025/ENU/?guid=RevitReleaseNotes_2025updates_2025_1_html"
+    },
+    {
+        "meta": {
+            "schema": "1.0",
+            "source": "https://help.autodesk.com/view/RVT/2025/ENU/?guid=RevitReleaseNotes_2025updates_2025_2_html"
+        },
+        "product": "Autodesk Revit",
+        "release": "2025.2",
+        "version": "25.2.0.38",
+        "build": "20240715_1515",
+        "target": "x64",
+        "notes": "https://help.autodesk.com/view/RVT/2025/ENU/?guid=RevitReleaseNotes_2025updates_2025_2_html"
     }
 ]
diff --git a/bin/pyrevit-products.json b/bin/pyrevit-products.json
@@ -1,4 +1,16 @@
 [
+ {
+  "product": "pyRevit",
+  "release": "4.8.16.24121+2117",
+  "version": "4.8.16.24121+2117",
+  "key": "c8a4b720-9699-4a03-bc67-273bab978723"
+ },
+ {
+  "product": "pyRevit",
+  "release": "4.8.15.24089+0912",
+  "version": "4.8.15.24089+0912",
+  "key": "6f430f6a-c452-4aa1-bb00-b690c50bea01"
+ },
  {
   "product": "pyRevit",
   "release": "4.8.14.24016+1909",
@@ -281,6 +293,18 @@
   "version": "4.6.1",
   "key": "{EF91A585-DC0C-43B8-B88B-4C130F430E84}"
  },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.16.24121+2117",
+  "version": "4.8.16.24121+2117",
+  "key": "2669428b-35bc-4824-afb5-9c8b7e343d3d"
+ },
+ {
+  "product": "pyRevit CLI",
+  "release": "4.8.15.24089+0912",
+  "version": "4.8.15.24089+0912",
+  "key": "2e94b164-49b1-49ff-8329-75a15000d3f9"
+ },
  {
   "product": "pyRevit CLI",
   "release": "4.8.14.24016+1909",

diff --git a/bin/pyrevit-stubsbuilder.exe b/bin/pyrevit-stubsbuilder.exe
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
diff --git a/bin/rhino3dmio_native.dll b/bin/rhino3dmio_native.dll
diff --git a/dev/Directory.Build.props b/dev/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>4.8.14.24016+1909</Version>
+    <Version>5.0.0.24174+2300</Version>
     <Copyright>Copyright © 2014-2024</Copyright>
     <Company>pyRevitLabs.io</Company>
   </PropertyGroup>

diff --git a/pyrevitlib/pyrevit/runtime/CLREngine.cs → dev/pyRevitLabs.PyRevit.Runtime/CLREngine.cs b/pyrevitlib/pyrevit/runtime/CLREngine.cs → dev/pyRevitLabs.PyRevit.Runtime/CLREngine.cs