Add: Support for Blender v4.0

nutti · Nov 18, 2023 · d20aa8f · d20aa8f
1 parent 03d5ded
commit d20aa8f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/fake-bpy-module-ci.yml b/.github/workflows/fake-bpy-module-ci.yml
@@ -56,7 +56,8 @@ jobs:
             "2.78", "2.79",
             "2.80", "2.81", "2.82", "2.83",
             "2.90", "2.91", "2.92", "2.93",
-            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6"
+            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+            "4.0"
           ]
     steps:
       - name: Checkout repo
@@ -156,7 +157,8 @@ jobs:
             "2.78", "2.79",
             "2.80", "2.81", "2.82", "2.83",
             "2.90", "2.91", "2.92", "2.93",
-            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6"
+            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+            "4.0"
           ]
     steps:
       - name: Fetch artifacts
@@ -185,7 +187,8 @@ jobs:
             "2.78", "2.79",
             "2.80", "2.81", "2.82", "2.83",
             "2.90", "2.91", "2.92", "2.93",
-            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6"
+            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+            "4.0"
           ]
     steps:
       - name: Fetch Artifacts
@@ -212,7 +215,8 @@ jobs:
             "2.78", "2.79",
             "2.80", "2.81", "2.82", "2.83",
             "2.90", "2.91", "2.92", "2.93",
-            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6"
+            "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+            "4.0"
           ]
     steps:
       - name: Fetch Artifacts

diff --git a/README.md b/README.md
@@ -73,6 +73,7 @@ being too big for intelliSense to work.*
 |3.4|[https://pypi.org/project/fake-bpy-module-3.4/](https://pypi.org/project/fake-bpy-module-3.4/)|
 |3.5|[https://pypi.org/project/fake-bpy-module-3.5/](https://pypi.org/project/fake-bpy-module-3.5/)|
 |3.6|[https://pypi.org/project/fake-bpy-module-3.6/](https://pypi.org/project/fake-bpy-module-3.6/)|
+|4.0|[https://pypi.org/project/fake-bpy-module-4.0/](https://pypi.org/project/fake-bpy-module-4.0/)|
 |latest|[https://pypi.org/project/fake-bpy-module-latest/](https://pypi.org/project/fake-bpy-module-latest/)|
 
 ### Install via pre-generated modules

diff --git a/src/fake_bpy_module/analyzer.py b/src/fake_bpy_module/analyzer.py
@@ -116,6 +116,7 @@ def _parse_module(self, file: IO[Any], level: int) -> str:
             elif self.target_version in [
                     "2.91", "2.92", "2.93",
                     "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+                    "4.0",
                     "latest"]:
                 if module_name == "bpy.data":
                     module_name = "bpy"

diff --git a/src/fake_bpy_module/support.py b/src/fake_bpy_module/support.py
@@ -15,6 +15,7 @@
     "2.80", "2.81", "2.82", "2.83",
     "2.90", "2.91", "2.92", "2.93",
     "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+    "4.0",
     "latest"
 ]
 
@@ -28,6 +29,7 @@
     "2.80", "2.81", "2.82", "2.83",
     "2.90", "2.91", "2.92", "2.93",
     "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6",
+    "4.0",
     "latest"
 ]
 

diff --git a/tests/pylint_cycles.sh b/tests/pylint_cycles.sh
@@ -19,6 +19,7 @@ declare -r SUPPORTED_BLENDER_VERSIONS=(
     "2.78" "2.79" "2.80" "2.81" "2.82" "2.83"
     "2.90" "2.91" "2.92" "2.93"
     "3.0" "3.1" "3.2" "3.3" "3.4" "3.5" "3.6"
+    "4.0"
     "latest"
 )
 declare -r SUPPORTED_UPBGE_VERSIONS=(
@@ -44,6 +45,7 @@ declare -A BLENDER_TAG_NAME=(
     ["v3.4"]="v3.4.0"
     ["v3.5"]="v3.5.0"
     ["v3.6"]="v3.6.0"
+    ["v4.0"]="v4.0.0"
     ["vlatest"]="main"
 )
 declare -A UPBGE_TAG_NAME=(
@@ -153,7 +155,7 @@ function workaround_quirks() {
     local version=$2
 
     if [ "${target}" = "blender" ]; then
-        if [[ $version =~ ^2.8[0-9]$ || $version =~ ^2.9[0-9]$ || $version =~ ^3.[0-9]$ || $version =~ ^latest$ ]]; then
+        if [[ $version =~ ^2.8[0-9]$ || $version =~ ^2.9[0-9]$ || $version =~ ^3.[0-9]$ || $version =~ ^4.[0-9]$ || $version =~ ^latest$ ]]; then
             # The method draw_panel_header comes from the Panel class which is a base class of CYCLES_PT_sampling_presets.
             # The error "E1120: No value for argument 'layout'" is raised when calling the classmethod implicitly derived
             # from base class. It is not clear why pylint does not handle this gracefully, so "fixing" it for pylint.

diff --git a/tools/pip_package/build_pip_package.sh b/tools/pip_package/build_pip_package.sh
@@ -7,6 +7,7 @@ SUPPORTED_BLENDER_VERSIONS=(
     "2.78" "2.79" "2.80" "2.81" "2.82" "2.83"
     "2.90" "2.91" "2.92" "2.93"
     "3.0" "3.1" "3.2" "3.3" "3.4" "3.5" "3.6"
+    "4.0"
     "latest"
 )
 SUPPORTED_UPBGE_VERSIONS=(
@@ -32,6 +33,7 @@ declare -A BLENDER_TAG_NAME=(
     ["v3.4"]="v3.4.0"
     ["v3.5"]="v3.5.0"
     ["v3.6"]="v3.6.0"
+    ["v4.0"]="v4.0.0"
     ["vlatest"]="main"
 )
 declare -A UPBGE_TAG_NAME=(

diff --git a/tools/utils/download_blender.sh b/tools/utils/download_blender.sh
@@ -7,6 +7,7 @@ SUPPORTED_VERSIONS=(
     "2.78" "2.79" "2.80" "2.81" "2.82" "2.83"
     "2.90" "2.91" "2.92" "2.93"
     "3.0" "3.1" "3.2" "3.3" "3.4" "3.5" "3.6"
+    "4.0"
     "all"
 )
 
@@ -45,6 +46,7 @@ declare -A BLENDER_DOWNLOAD_URL_WIN64=(
     ["v3.4"]="https://download.blender.org/release/Blender3.4/blender-3.4.0-windows-x64.zip"
     ["v3.5"]="https://download.blender.org/release/Blender3.5/blender-3.5.0-windows-x64.zip"
     ["v3.6"]="https://download.blender.org/release/Blender3.6/blender-3.6.0-windows-x64.zip"
+    ["v4.0"]="https://download.blender.org/release/Blender4.0/blender-4.0.0-windows-x64.zip"
 )
 
 declare -A BLENDER_DOWNLOAD_URL_LINUX=(
@@ -65,6 +67,7 @@ declare -A BLENDER_DOWNLOAD_URL_LINUX=(
     ["v3.4"]="https://download.blender.org/release/Blender3.4/blender-3.4.0-linux-x64.tar.xz"
     ["v3.5"]="https://download.blender.org/release/Blender3.5/blender-3.5.0-linux-x64.tar.xz"
     ["v3.6"]="https://download.blender.org/release/Blender3.6/blender-3.6.0-linux-x64.tar.xz"
+    ["v4.0"]="https://download.blender.org/release/Blender4.0/blender-4.0.0-linux-x64.tar.xz"
 )
 
 declare -A NEED_MOVE_MACOSX=(
@@ -93,6 +96,7 @@ declare -A NEED_MOVE_LINUX=(
     ["v3.4"]="blender-3.4.0-linux-x64"
     ["v3.5"]="blender-3.5.0-linux-x64"
     ["v3.6"]="blender-3.6.0-linux-x64"
+    ["v4.0"]="blender-4.0.0-linux-x64"
 )
 
 declare -A BLENDER_CHECKSUM_URL=(
@@ -113,6 +117,7 @@ declare -A BLENDER_CHECKSUM_URL=(
     ["v3.4"]="https://download.blender.org/release/Blender3.4/blender-3.4.0.md5"
     ["v3.5"]="https://download.blender.org/release/Blender3.5/blender-3.5.0.md5"
     ["v3.6"]="https://download.blender.org/release/Blender3.6/blender-3.6.0.md5"
+    ["v4.0"]="https://download.blender.org/release/Blender4.0/blender-4.0.0.md5"
 )
 
 function get_extractor() {