Skip to content

Commit

Permalink
supports installation of subset of Catharsys modules
Browse files Browse the repository at this point in the history
Signed-off-by: cribeul <christian.perwass@de.bosch.com>
  • Loading branch information
cribeul committed Dec 8, 2023
1 parent 3633c04 commit 1ae38a4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
3 changes: 2 additions & 1 deletion docs/source/change-log.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

To update a develop installation to this version, you need to run `cathy install system --update`. This should clone new repositories and install all modified modules in the Anaconda environment. You may also have to update the Catharsys installation in Blender using `cathy blender init -c [your config]`.

- **Blender 4.0 Support**
- **Blender**
- Blender 4 has some breaking changes in its' Python code. The Catharsys code has been adapted to support Blender 3.x and 4.0.
- Only the Catharsys modules that are needed in Blender are installed to Blender python now. The list of modules that are installed is given in the file `image-render-actions-std-blender/src/catharsys/plugins/std/blender/data/blender-install.json5`. The module names are actually interpreted as regular expressions.

- **Generative AI Action**
- A generative AI action repository is now added as `image-render-generative`.
Expand Down
14 changes: 13 additions & 1 deletion src/catharsys/setup/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -597,15 +597,27 @@ def InstallModules(
bForceDist: bool,
bForceInstall: bool,
bSourceDist: bool,
lIncludeRegEx: list[str] = [],
):
lIncRegEx: list[str] = []
if isinstance(g_debug_lInstallModules, list) and len(g_debug_lInstallModules) > 0:
lIncRegEx.extend(g_debug_lInstallModules)
# endif

if isinstance(lIncludeRegEx, list) and len(lIncludeRegEx) > 0:
lIncRegEx.extend(lIncludeRegEx)
# endif

# print(f"lIncRegEx: {lIncRegEx}")

ForEach(
bForceDist=bForceDist,
bSourceDist=bSourceDist,
# funcRunRepo=CreateInstallRepoHandler(sPathPythonProg, bForceInstall),
# funcRunDist=CreateInstallDistHandler(sPathPythonProg, bForceInstall),
funcRunRepo=CRepoHandlerFactory.CreateInstall(sPathPythonProg, bForceInstall),
funcRunDist=CDistHandlerFactory.CreateInstall(sPathPythonProg, bForceInstall),
lIncludeRegEx=g_debug_lInstallModules,
lIncludeRegEx=lIncRegEx,
lExcludeRegEx=["image-render-workspace-.+"],
)

Expand Down

0 comments on commit 1ae38a4

Please sign in to comment.