Merge pull request LuxCoreRender#30 from LuxCoreRender/for_v1.1

For v1.1

Author: howetuft

.github/workflows/build.yml

@@ -9,6 +9,8 @@
 
 name: LuxCore Dependency Checker
 
+permissions: read-all
+
 on:
   workflow_dispatch:
   push:
@@ -17,4 +19,5 @@ jobs:
   call-build-deps:
     uses: ./.github/workflows/build.yml
     with:
+      # This must be kept in lower case (incorporated to Conan package name)
       luxdeps-version: "check"

.github/workflows/check.yml

@@ -12,6 +12,8 @@
 
 name: LuxCore Dependency Monitoring
 
+permissions: read-all
+
 on:
   schedule:
     - cron: "0 0 * * 5"
@@ -20,4 +22,5 @@ jobs:
   call-build-deps:
     uses: ./.github/workflows/build.yml
     with:
-      luxdeps-version: "Monitor"
+      # This must be kept in lower case (incorporated to Conan package name)
+      luxdeps-version: "monitor"

.github/workflows/monitor.yml

@@ -23,10 +23,10 @@ Once populated, the cache is bundled (`conan cache save`) and published
 in a Github release.
 
 ### On consumer side (LuxCore)
-In LuxCore, the provided cache is downloaded from the release and
-restored locally (`conan cache restore`), thus making all the dependencies
+In LuxCore, the provided cache is downloaded from the LuxCoreDeps release
+and restored locally (`conan cache restore`), thus making all the dependencies
 available for LuxCore build.
-In LuxCore, cache download and restoration are wrapped in a convenient
+In LuxCore, the download and restoration of the cache are wrapped in a convenient
 `make deps` statement.
 
 ```mermaid
@@ -98,6 +98,7 @@ how to modify such a file.
 ### Where to start - LuxCoreDeps entry points
 The main entry point is `.github/workflows/build.yml`.
 Other interesting files may be:
+- `run-conan.sh`: the bash script that invokes Conan
 - `conanfile.py`: Conan script to build dependencies
 - `conan-profiles`: folder with Conan profiles
 
@@ -107,7 +108,8 @@ LuxCoreDeps follows Semantic Versioning (https://semver.org).
 ### Compilation environment
 For Python wheels to be built properly, it is essential that dependencies be built
 by `CIBUILDWHEEL`, with the same environment (compiler version, manylinux container,
-etc.) as the one intended for the wheels.
+etc.) as the one intended for the wheels. This is especially true for Linux build, which
+must occur in a manylinux container. See https://cibuildwheel.pypa.io/en/stable/ for more details.
 
 ### Local recipes
 Most of Conan recipes used by LuxCoreDeps are to be found in Conan central repository (Conan center).

CMakeLists.txt

@@ -17,7 +17,6 @@ class ImguiFileDialogConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
     homepage = "https://github.com/aiekick/ImGuiFileDialog"
     license = "MIT"
-    version = "0.6.7"
     options = {
         "shared": [True, False],
         "fPIC": [True, False],
@@ -28,7 +27,7 @@ class ImguiFileDialogConan(ConanFile):
         "fPIC": True,
         "use_std_filesystem": True,
     }
-    requires = "imgui/1.91.8"
+    requires = "imgui/1.92.4"
 
 
     def config_options(self):

README.md

@@ -0,0 +1,3 @@
+versions:
+  "0.6.7":
+    folder: all

…an-recipes/imguifiledialog/conandata.yml …ecipes/imguifiledialog/all/conandata.ymllocal-conan-recipes/imguifiledialog/conandata.yml renamed to conan-local-recipes/recipes/imguifiledialog/all/conandata.yml local-conan-recipes/imguifiledialog/conandata.yml renamed to conan-local-recipes/recipes/imguifiledialog/all/conandata.yml

@@ -0,0 +1,19 @@
+sources:
+  "12.8.93":
+    Linux:
+      x86_64:
+        url: "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.8.93-archive.tar.xz"
+        sha256: "992f5e4d95cb499f41e442245efa877dbd60c711451afe680a26700d61eb3843"
+    Windows:
+      x86_64:
+        url: "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.8.93-archive.zip"
+        sha256: "a63302a077f0248a743a1a7caa7dbd80d0fac56c6cfa9c41fa05fac9b7e5eda5"
+  "13.0.88":
+    Linux:
+      x86_64:
+        url: "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-13.0.88-archive.tar.xz"
+        sha256: "00038aac08e1dba6f1933237dbfb217ac6452ae24fab970edcac808f103ca64b"
+    Windows:
+      x86_64:
+        url: "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-13.0.88-archive.zip"
+        sha256: "8c50a52467826167e0dbe99936140c52d62272bfc5849fe2d6587d050c8c5d29"

…nan-recipes/imguifiledialog/conanfile.py …recipes/imguifiledialog/all/conanfile.pylocal-conan-recipes/imguifiledialog/conanfile.py renamed to conan-local-recipes/recipes/imguifiledialog/all/conanfile.py local-conan-recipes/imguifiledialog/conanfile.py renamed to conan-local-recipes/recipes/imguifiledialog/all/conanfile.py

@@ -9,7 +9,6 @@
 
 class nvrtcRecipe(ConanFile):
     name = "nvrtc"
-    version = "12.8.61"
     user = "luxcore"
     channel = "luxcore"
     package_type = "library"
@@ -28,19 +27,13 @@ def validate(self):
             raise ConanInvalidConfiguration("MacOS not supported")
 
     def build(self):
-        _os = str(self.settings.os)
-        quirks = {
-            "Linux": ("linux-x86_64", "tar.xz"),
-            "Windows": ("windows-x86_64", "zip"),
-        }
-
-        platform, extension = quirks[_os]
-
-        url = (
-            "https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvrtc/"
-            f"{platform}/cuda_nvrtc-{platform}-{self.version}-archive.{extension}"
+        arch = "x86_64"
+        get(
+            self,
+            **self.conan_data["sources"][self.version][str(self.settings.os)][arch],
+            destination=self.build_folder,
+            strip_root=True
         )
-        get(self, url, destination=self.build_folder, strip_root=True)
 
     def generate(self):
         tc = CMakeToolchain(self)