Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved Python module import dependencies #1595

Merged
merged 6 commits into from
Nov 9, 2023
Merged

Resolved Python module import dependencies #1595

merged 6 commits into from
Nov 9, 2023

Commits on Nov 6, 2023

  1. Resolved Python import order dependency issue. 

    This patch adds calls of `pybind11::module::import()` to the Python
bindings of modules that depend on specific other modules.

This approach is similar to importing required modules via `import` in
Python packages/modules.

With this patch in place, it's possible to import any of the MaterialX
Python modules in any order.

Signed-off-by: Stefan Habel <[email protected]>
    @StefanHabel
    StefanHabel committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    01cb109 View commit details
    Browse the repository at this point in the history

  2. Added PYMATERIALX_IMPORT_MODULE macro to import a PyMaterialX module 

    either within the `MaterialX` Python package or as a standalone module.

Signed-off-by: Stefan Habel <[email protected]>
    @StefanHabel
    StefanHabel committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    246a34e View commit details
    Browse the repository at this point in the history

  3. Added unittest for importing MaterialX Python C extension modules. 

    To test:
```bash
cmake . -DMATERIALX_BUILD_PYTHON=ON \
&& cmake --build . \
&& make install \
&& python3 python/MaterialXTest/imports.py
```

Signed-off-by: Stefan Habel <[email protected]>
    @StefanHabel
    StefanHabel committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    e08075c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Removed unused MaterialX imports from two Python scripts. 

    Also sorted imports in `generateshader.py` alphabetically.

Signed-off-by: Stefan Habel <[email protected]>
    @StefanHabel
    StefanHabel committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    1cd726c View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Minor update to coding style 

    Signed-off-by: Jonathan Stone <[email protected]>
    @jstone-lucasfilm
    jstone-lucasfilm committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    660804e View commit details
    Browse the repository at this point in the history

  2. Omit imports.py 

    Signed-off-by: Jonathan Stone <[email protected]>
    @jstone-lucasfilm
    jstone-lucasfilm committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    68da5e9 View commit details
    Browse the repository at this point in the history