diff --git a/docs/source/pype.hosts.aftereffects.rst b/docs/source/pype.hosts.aftereffects.rst new file mode 100644 index 0000000000..3c2b2dda41 --- /dev/null +++ b/docs/source/pype.hosts.aftereffects.rst @@ -0,0 +1,7 @@ +pype.hosts.aftereffects package +=============================== + +.. automodule:: pype.hosts.aftereffects + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.hosts.resolve.otio.davinci_export.rst b/docs/source/pype.hosts.resolve.otio.davinci_export.rst new file mode 100644 index 0000000000..498f96a7ed --- /dev/null +++ b/docs/source/pype.hosts.resolve.otio.davinci_export.rst @@ -0,0 +1,7 @@ +pype.hosts.resolve.otio.davinci\_export module +============================================== + +.. automodule:: pype.hosts.resolve.otio.davinci_export + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.hosts.resolve.otio.davinci_import.rst b/docs/source/pype.hosts.resolve.otio.davinci_import.rst new file mode 100644 index 0000000000..30f43cc9fe --- /dev/null +++ b/docs/source/pype.hosts.resolve.otio.davinci_import.rst @@ -0,0 +1,7 @@ +pype.hosts.resolve.otio.davinci\_import module +============================================== + +.. automodule:: pype.hosts.resolve.otio.davinci_import + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.hosts.resolve.otio.rst b/docs/source/pype.hosts.resolve.otio.rst new file mode 100644 index 0000000000..523d8937ca --- /dev/null +++ b/docs/source/pype.hosts.resolve.otio.rst @@ -0,0 +1,17 @@ +pype.hosts.resolve.otio package +=============================== + +.. automodule:: pype.hosts.resolve.otio + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.hosts.resolve.otio.davinci_export + pype.hosts.resolve.otio.davinci_import + pype.hosts.resolve.otio.utils diff --git a/docs/source/pype.hosts.resolve.otio.utils.rst b/docs/source/pype.hosts.resolve.otio.utils.rst new file mode 100644 index 0000000000..765f492732 --- /dev/null +++ b/docs/source/pype.hosts.resolve.otio.utils.rst @@ -0,0 +1,7 @@ +pype.hosts.resolve.otio.utils module +==================================== + +.. automodule:: pype.hosts.resolve.otio.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.hosts.resolve.todo-rendering.rst b/docs/source/pype.hosts.resolve.todo-rendering.rst new file mode 100644 index 0000000000..8ea80183ce --- /dev/null +++ b/docs/source/pype.hosts.resolve.todo-rendering.rst @@ -0,0 +1,7 @@ +pype.hosts.resolve.todo\-rendering module +========================================= + +.. automodule:: pype.hosts.resolve.todo-rendering + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.hosts.tvpaint.api.rst b/docs/source/pype.hosts.tvpaint.api.rst new file mode 100644 index 0000000000..43273e8ec5 --- /dev/null +++ b/docs/source/pype.hosts.tvpaint.api.rst @@ -0,0 +1,7 @@ +pype.hosts.tvpaint.api package +============================== + +.. automodule:: pype.hosts.tvpaint.api + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.hosts.tvpaint.rst b/docs/source/pype.hosts.tvpaint.rst new file mode 100644 index 0000000000..561be3a9dc --- /dev/null +++ b/docs/source/pype.hosts.tvpaint.rst @@ -0,0 +1,15 @@ +pype.hosts.tvpaint package +========================== + +.. automodule:: pype.hosts.tvpaint + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 10 + + pype.hosts.tvpaint.api diff --git a/docs/source/pype.lib.abstract_collect_render.rst b/docs/source/pype.lib.abstract_collect_render.rst new file mode 100644 index 0000000000..d6adadc271 --- /dev/null +++ b/docs/source/pype.lib.abstract_collect_render.rst @@ -0,0 +1,7 @@ +pype.lib.abstract\_collect\_render module +========================================= + +.. automodule:: pype.lib.abstract_collect_render + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.abstract_expected_files.rst b/docs/source/pype.lib.abstract_expected_files.rst new file mode 100644 index 0000000000..904aeb3375 --- /dev/null +++ b/docs/source/pype.lib.abstract_expected_files.rst @@ -0,0 +1,7 @@ +pype.lib.abstract\_expected\_files module +========================================= + +.. automodule:: pype.lib.abstract_expected_files + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.abstract_metaplugins.rst b/docs/source/pype.lib.abstract_metaplugins.rst new file mode 100644 index 0000000000..9f2751b630 --- /dev/null +++ b/docs/source/pype.lib.abstract_metaplugins.rst @@ -0,0 +1,7 @@ +pype.lib.abstract\_metaplugins module +===================================== + +.. automodule:: pype.lib.abstract_metaplugins + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.abstract_submit_deadline.rst b/docs/source/pype.lib.abstract_submit_deadline.rst new file mode 100644 index 0000000000..a57222add3 --- /dev/null +++ b/docs/source/pype.lib.abstract_submit_deadline.rst @@ -0,0 +1,7 @@ +pype.lib.abstract\_submit\_deadline module +========================================== + +.. automodule:: pype.lib.abstract_submit_deadline + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.applications.rst b/docs/source/pype.lib.applications.rst new file mode 100644 index 0000000000..8d1ff9b2c6 --- /dev/null +++ b/docs/source/pype.lib.applications.rst @@ -0,0 +1,7 @@ +pype.lib.applications module +============================ + +.. automodule:: pype.lib.applications + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.avalon_context.rst b/docs/source/pype.lib.avalon_context.rst new file mode 100644 index 0000000000..067ea3380f --- /dev/null +++ b/docs/source/pype.lib.avalon_context.rst @@ -0,0 +1,7 @@ +pype.lib.avalon\_context module +=============================== + +.. automodule:: pype.lib.avalon_context + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.deprecated.rst b/docs/source/pype.lib.deprecated.rst new file mode 100644 index 0000000000..ec5ee58d67 --- /dev/null +++ b/docs/source/pype.lib.deprecated.rst @@ -0,0 +1,7 @@ +pype.lib.deprecated module +========================== + +.. automodule:: pype.lib.deprecated + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.editorial.rst b/docs/source/pype.lib.editorial.rst new file mode 100644 index 0000000000..d32e495e51 --- /dev/null +++ b/docs/source/pype.lib.editorial.rst @@ -0,0 +1,7 @@ +pype.lib.editorial module +========================= + +.. automodule:: pype.lib.editorial + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.env_tools.rst b/docs/source/pype.lib.env_tools.rst new file mode 100644 index 0000000000..cb470207c8 --- /dev/null +++ b/docs/source/pype.lib.env_tools.rst @@ -0,0 +1,7 @@ +pype.lib.env\_tools module +========================== + +.. automodule:: pype.lib.env_tools + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.ffmpeg_utils.rst b/docs/source/pype.lib.ffmpeg_utils.rst new file mode 100644 index 0000000000..968a3f39c8 --- /dev/null +++ b/docs/source/pype.lib.ffmpeg_utils.rst @@ -0,0 +1,7 @@ +pype.lib.ffmpeg\_utils module +============================= + +.. automodule:: pype.lib.ffmpeg_utils + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.path_tools.rst b/docs/source/pype.lib.path_tools.rst new file mode 100644 index 0000000000..c19c41eea3 --- /dev/null +++ b/docs/source/pype.lib.path_tools.rst @@ -0,0 +1,7 @@ +pype.lib.path\_tools module +=========================== + +.. automodule:: pype.lib.path_tools + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.plugin_tools.rst b/docs/source/pype.lib.plugin_tools.rst new file mode 100644 index 0000000000..6eadc5d3be --- /dev/null +++ b/docs/source/pype.lib.plugin_tools.rst @@ -0,0 +1,7 @@ +pype.lib.plugin\_tools module +============================= + +.. automodule:: pype.lib.plugin_tools + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.python_module_tools.rst b/docs/source/pype.lib.python_module_tools.rst new file mode 100644 index 0000000000..c916080bce --- /dev/null +++ b/docs/source/pype.lib.python_module_tools.rst @@ -0,0 +1,7 @@ +pype.lib.python\_module\_tools module +===================================== + +.. automodule:: pype.lib.python_module_tools + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.lib.terminal_splash.rst b/docs/source/pype.lib.terminal_splash.rst new file mode 100644 index 0000000000..06038f0f09 --- /dev/null +++ b/docs/source/pype.lib.terminal_splash.rst @@ -0,0 +1,7 @@ +pype.lib.terminal\_splash module +================================ + +.. automodule:: pype.lib.terminal_splash + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.clockify.clockify_module.rst b/docs/source/pype.modules.clockify.clockify_module.rst new file mode 100644 index 0000000000..85f8e75ad1 --- /dev/null +++ b/docs/source/pype.modules.clockify.clockify_module.rst @@ -0,0 +1,7 @@ +pype.modules.clockify.clockify\_module module +============================================= + +.. automodule:: pype.modules.clockify.clockify_module + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.deadline.deadline_module.rst b/docs/source/pype.modules.deadline.deadline_module.rst new file mode 100644 index 0000000000..43e7198a8b --- /dev/null +++ b/docs/source/pype.modules.deadline.deadline_module.rst @@ -0,0 +1,7 @@ +pype.modules.deadline.deadline\_module module +============================================= + +.. automodule:: pype.modules.deadline.deadline_module + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.deadline.rst b/docs/source/pype.modules.deadline.rst new file mode 100644 index 0000000000..7633b2b950 --- /dev/null +++ b/docs/source/pype.modules.deadline.rst @@ -0,0 +1,15 @@ +pype.modules.deadline package +============================= + +.. automodule:: pype.modules.deadline + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.modules.deadline.deadline_module diff --git a/docs/source/pype.modules.ftrack.ftrack_module.rst b/docs/source/pype.modules.ftrack.ftrack_module.rst new file mode 100644 index 0000000000..4188ffbed8 --- /dev/null +++ b/docs/source/pype.modules.ftrack.ftrack_module.rst @@ -0,0 +1,7 @@ +pype.modules.ftrack.ftrack\_module module +========================================= + +.. automodule:: pype.modules.ftrack.ftrack_module + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.ftrack.lib.settings.rst b/docs/source/pype.modules.ftrack.lib.settings.rst new file mode 100644 index 0000000000..255d52178a --- /dev/null +++ b/docs/source/pype.modules.ftrack.lib.settings.rst @@ -0,0 +1,7 @@ +pype.modules.ftrack.lib.settings module +======================================= + +.. automodule:: pype.modules.ftrack.lib.settings + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.ftrack.tray.ftrack_tray.rst b/docs/source/pype.modules.ftrack.tray.ftrack_tray.rst new file mode 100644 index 0000000000..147647e9b4 --- /dev/null +++ b/docs/source/pype.modules.ftrack.tray.ftrack_tray.rst @@ -0,0 +1,7 @@ +pype.modules.ftrack.tray.ftrack\_tray module +============================================ + +.. automodule:: pype.modules.ftrack.tray.ftrack_tray + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.launcher_action.rst b/docs/source/pype.modules.launcher_action.rst new file mode 100644 index 0000000000..a63408e747 --- /dev/null +++ b/docs/source/pype.modules.launcher_action.rst @@ -0,0 +1,7 @@ +pype.modules.launcher\_action module +==================================== + +.. automodule:: pype.modules.launcher_action + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.log_viewer.log_view_module.rst b/docs/source/pype.modules.log_viewer.log_view_module.rst new file mode 100644 index 0000000000..8d80170a9c --- /dev/null +++ b/docs/source/pype.modules.log_viewer.log_view_module.rst @@ -0,0 +1,7 @@ +pype.modules.log\_viewer.log\_view\_module module +================================================= + +.. automodule:: pype.modules.log_viewer.log_view_module + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.log_viewer.rst b/docs/source/pype.modules.log_viewer.rst new file mode 100644 index 0000000000..e275d56086 --- /dev/null +++ b/docs/source/pype.modules.log_viewer.rst @@ -0,0 +1,23 @@ +pype.modules.log\_viewer package +================================ + +.. automodule:: pype.modules.log_viewer + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 10 + + pype.modules.log_viewer.tray + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.modules.log_viewer.log_view_module diff --git a/docs/source/pype.modules.log_viewer.tray.app.rst b/docs/source/pype.modules.log_viewer.tray.app.rst new file mode 100644 index 0000000000..0948a05594 --- /dev/null +++ b/docs/source/pype.modules.log_viewer.tray.app.rst @@ -0,0 +1,7 @@ +pype.modules.log\_viewer.tray.app module +======================================== + +.. automodule:: pype.modules.log_viewer.tray.app + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.log_viewer.tray.models.rst b/docs/source/pype.modules.log_viewer.tray.models.rst new file mode 100644 index 0000000000..4da3887600 --- /dev/null +++ b/docs/source/pype.modules.log_viewer.tray.models.rst @@ -0,0 +1,7 @@ +pype.modules.log\_viewer.tray.models module +=========================================== + +.. automodule:: pype.modules.log_viewer.tray.models + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.log_viewer.tray.rst b/docs/source/pype.modules.log_viewer.tray.rst new file mode 100644 index 0000000000..5f4b92f627 --- /dev/null +++ b/docs/source/pype.modules.log_viewer.tray.rst @@ -0,0 +1,17 @@ +pype.modules.log\_viewer.tray package +===================================== + +.. automodule:: pype.modules.log_viewer.tray + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.modules.log_viewer.tray.app + pype.modules.log_viewer.tray.models + pype.modules.log_viewer.tray.widgets diff --git a/docs/source/pype.modules.log_viewer.tray.widgets.rst b/docs/source/pype.modules.log_viewer.tray.widgets.rst new file mode 100644 index 0000000000..cb57c96559 --- /dev/null +++ b/docs/source/pype.modules.log_viewer.tray.widgets.rst @@ -0,0 +1,7 @@ +pype.modules.log\_viewer.tray.widgets module +============================================ + +.. automodule:: pype.modules.log_viewer.tray.widgets + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.settings_action.rst b/docs/source/pype.modules.settings_action.rst new file mode 100644 index 0000000000..10f0881ced --- /dev/null +++ b/docs/source/pype.modules.settings_action.rst @@ -0,0 +1,7 @@ +pype.modules.settings\_action module +==================================== + +.. automodule:: pype.modules.settings_action + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.standalonepublish_action.rst b/docs/source/pype.modules.standalonepublish_action.rst new file mode 100644 index 0000000000..d51dbcefa0 --- /dev/null +++ b/docs/source/pype.modules.standalonepublish_action.rst @@ -0,0 +1,7 @@ +pype.modules.standalonepublish\_action module +============================================= + +.. automodule:: pype.modules.standalonepublish_action + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.sync_server.rst b/docs/source/pype.modules.sync_server.rst new file mode 100644 index 0000000000..a26dc7e212 --- /dev/null +++ b/docs/source/pype.modules.sync_server.rst @@ -0,0 +1,16 @@ +pype.modules.sync\_server package +================================= + +.. automodule:: pype.modules.sync_server + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.modules.sync_server.sync_server + pype.modules.sync_server.utils diff --git a/docs/source/pype.modules.sync_server.sync_server.rst b/docs/source/pype.modules.sync_server.sync_server.rst new file mode 100644 index 0000000000..36d6aa68ed --- /dev/null +++ b/docs/source/pype.modules.sync_server.sync_server.rst @@ -0,0 +1,7 @@ +pype.modules.sync\_server.sync\_server module +============================================= + +.. automodule:: pype.modules.sync_server.sync_server + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.sync_server.utils.rst b/docs/source/pype.modules.sync_server.utils.rst new file mode 100644 index 0000000000..325d5e435d --- /dev/null +++ b/docs/source/pype.modules.sync_server.utils.rst @@ -0,0 +1,7 @@ +pype.modules.sync\_server.utils module +====================================== + +.. automodule:: pype.modules.sync_server.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.modules.websocket_server.hosts.aftereffects.rst b/docs/source/pype.modules.websocket_server.hosts.aftereffects.rst new file mode 100644 index 0000000000..9f4720ae14 --- /dev/null +++ b/docs/source/pype.modules.websocket_server.hosts.aftereffects.rst @@ -0,0 +1,7 @@ +pype.modules.websocket\_server.hosts.aftereffects module +======================================================== + +.. automodule:: pype.modules.websocket_server.hosts.aftereffects + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.plugins.maya.publish.validate_vray_referenced_aovs.rst b/docs/source/pype.plugins.maya.publish.validate_vray_referenced_aovs.rst new file mode 100644 index 0000000000..16ad9666aa --- /dev/null +++ b/docs/source/pype.plugins.maya.publish.validate_vray_referenced_aovs.rst @@ -0,0 +1,7 @@ +pype.plugins.maya.publish.validate\_vray\_referenced\_aovs module +================================================================= + +.. automodule:: pype.plugins.maya.publish.validate_vray_referenced_aovs + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.settings.constants.rst b/docs/source/pype.settings.constants.rst new file mode 100644 index 0000000000..ac652089c8 --- /dev/null +++ b/docs/source/pype.settings.constants.rst @@ -0,0 +1,7 @@ +pype.settings.constants module +============================== + +.. automodule:: pype.settings.constants + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.settings.handlers.rst b/docs/source/pype.settings.handlers.rst new file mode 100644 index 0000000000..60ea0ae952 --- /dev/null +++ b/docs/source/pype.settings.handlers.rst @@ -0,0 +1,7 @@ +pype.settings.handlers module +============================= + +.. automodule:: pype.settings.handlers + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.tests.test_lib_restructuralization.rst b/docs/source/pype.tests.test_lib_restructuralization.rst new file mode 100644 index 0000000000..8d426fcb6b --- /dev/null +++ b/docs/source/pype.tests.test_lib_restructuralization.rst @@ -0,0 +1,7 @@ +pype.tests.test\_lib\_restructuralization module +================================================ + +.. automodule:: pype.tests.test_lib_restructuralization + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.tools.tray.pype_tray.rst b/docs/source/pype.tools.tray.pype_tray.rst new file mode 100644 index 0000000000..9fc49c5763 --- /dev/null +++ b/docs/source/pype.tools.tray.pype_tray.rst @@ -0,0 +1,7 @@ +pype.tools.tray.pype\_tray module +================================= + +.. automodule:: pype.tools.tray.pype_tray + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.tools.tray.rst b/docs/source/pype.tools.tray.rst new file mode 100644 index 0000000000..b28059d170 --- /dev/null +++ b/docs/source/pype.tools.tray.rst @@ -0,0 +1,15 @@ +pype.tools.tray package +======================= + +.. automodule:: pype.tools.tray + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.tools.tray.pype_tray diff --git a/docs/source/pype.tools.workfiles.app.rst b/docs/source/pype.tools.workfiles.app.rst new file mode 100644 index 0000000000..a3a46b8a07 --- /dev/null +++ b/docs/source/pype.tools.workfiles.app.rst @@ -0,0 +1,7 @@ +pype.tools.workfiles.app module +=============================== + +.. automodule:: pype.tools.workfiles.app + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.tools.workfiles.model.rst b/docs/source/pype.tools.workfiles.model.rst new file mode 100644 index 0000000000..44cea32b97 --- /dev/null +++ b/docs/source/pype.tools.workfiles.model.rst @@ -0,0 +1,7 @@ +pype.tools.workfiles.model module +================================= + +.. automodule:: pype.tools.workfiles.model + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/pype.tools.workfiles.rst b/docs/source/pype.tools.workfiles.rst new file mode 100644 index 0000000000..147c4cebbe --- /dev/null +++ b/docs/source/pype.tools.workfiles.rst @@ -0,0 +1,17 @@ +pype.tools.workfiles package +============================ + +.. automodule:: pype.tools.workfiles + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +.. toctree:: + :maxdepth: 10 + + pype.tools.workfiles.app + pype.tools.workfiles.model + pype.tools.workfiles.view diff --git a/docs/source/pype.tools.workfiles.view.rst b/docs/source/pype.tools.workfiles.view.rst new file mode 100644 index 0000000000..acd32ed250 --- /dev/null +++ b/docs/source/pype.tools.workfiles.view.rst @@ -0,0 +1,7 @@ +pype.tools.workfiles.view module +================================ + +.. automodule:: pype.tools.workfiles.view + :members: + :undoc-members: + :show-inheritance: diff --git a/igniter/__init__.py b/igniter/__init__.py index eda37c5af3..ffac2b023f 100644 --- a/igniter/__init__.py +++ b/igniter/__init__.py @@ -10,11 +10,11 @@ from .bootstrap_repos import BootstrapRepos def run(): """Show Igniter dialog.""" - # app = QtWidgets.QApplication(sys.argv) + app = QtWidgets.QApplication(sys.argv) d = InstallDialog() d.exec_() - #d.show() - #sys.exit(app.exec_()) + d.show() + sys.exit(app.exec_()) __all__ = [ diff --git a/igniter/bootstrap_repos.py b/igniter/bootstrap_repos.py index 2a71887fbf..f53aa77db7 100644 --- a/igniter/bootstrap_repos.py +++ b/igniter/bootstrap_repos.py @@ -8,7 +8,7 @@ import shutil import sys import tempfile from pathlib import Path -from typing import Union, Callable, List, Tuple +from typing import Union, Callable, List, Tuple, Optional from zipfile import ZipFile, BadZipFile from appdirs import user_data_dir @@ -62,9 +62,10 @@ class PypeVersion: path: Path = None): self.path = path - if major is None or minor is None or subversion is None: - if version is None: - raise ValueError("Need version specified in some way.") + if ( + major is None or minor is None or subversion is None + ) and version is None: + raise ValueError("Need version specified in some way.") if version: values = self._decompose_version(version) self.major = values[0] @@ -133,12 +134,18 @@ class PypeVersion: self.subversion < other.subversion: return True - if self.major == other.major and self.minor == other.minor and \ - self.subversion == other.subversion and \ - self.variant == "staging": + # Directory takes precedence over file + if ( + self.path + and other.path + and other.path.is_dir() + and self.path.is_file() + ): return True - return False + return self.major == other.major and self.minor == other.minor and \ + self.subversion == other.subversion and self.variant == "staging" + def is_staging(self) -> bool: """Test if current version is staging one.""" @@ -435,6 +442,9 @@ class BootstrapRepos: archive (Path): path to archive. """ + if not archive.is_file() and not archive.exists(): + raise ValueError("Archive is not file.") + with ZipFile(archive, "r") as zip_file: name_list = zip_file.namelist() @@ -464,6 +474,9 @@ class BootstrapRepos: directory (Path): path to directory. """ + if not directory.exists() and not directory.is_dir(): + raise ValueError("directory is invalid") + roots = [] for item in directory.iterdir(): if item.is_dir(): @@ -583,8 +596,8 @@ class BootstrapRepos: version_check = PypeVersion( version=zip_version["__version__"]) - version_main = version_check.get_main_version() - detected_main = detected_version.get_main_version() + version_main = version_check.get_main_version() # noqa: E501 + detected_main = detected_version.get_main_version() # noqa: E501 if version_main != detected_main: self._log.error( @@ -762,7 +775,17 @@ class BootstrapRepos: if self._message: self._message.emit(message, error) - def extract_pype(self, version: PypeVersion): + def extract_pype(self, version: PypeVersion) -> Union[Path, None]: + """Extract zipped Pype version to user data directory. + + Args: + version (PypeVersion): Version of Pype. + + Returns: + Path: path to extracted version. + None: if something failed. + + """ if not version.path: raise ValueError( f"version {version} is not associated with any file") @@ -777,7 +800,7 @@ class BootstrapRepos: self._log.error(e.strerror) self._print(msg, True) self._print(e.strerror, True) - return + return None destination.mkdir(parents=True) @@ -788,6 +811,8 @@ class BootstrapRepos: self._print(f"Installed as {version.path.stem}") + return destination + def install_version(self, pype_version: PypeVersion, force: bool = False): """Install Pype version to user data directory. diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 74d9435815..b4fa68d89a 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -308,14 +308,17 @@ class InstallDialog(QtWidgets.QDialog): options |= QtWidgets.QFileDialog.DontUseNativeDialog options |= QtWidgets.QFileDialog.ShowDirsOnly - filename, _ = QtWidgets.QFileDialog.getExistingDirectory( + result = QtWidgets.QFileDialog.getExistingDirectory( parent=self, caption='Select path', directory=os.getcwd(), options=options) - if filename: - filename = QtCore.QDir.toNativeSeparators(filename) + if not result: + return + + filename = result[0] + filename = QtCore.QDir.toNativeSeparators(filename) if os.path.isdir(filename): self.user_input.setText(filename) diff --git a/start.py b/start.py index 55fb979b8d..75673e63c5 100644 --- a/start.py +++ b/start.py @@ -119,7 +119,7 @@ def set_environments() -> None: env = load_environments(["global"]) except OSError as e: print(f"!!! {e}") - exit() + sys.exit(1) env = acre.merge(env, dict(os.environ)) os.environ.clear() @@ -239,7 +239,7 @@ def boot(): pype_mongo = bootstrap.registry.get_secure_item("pypeMongo") except ValueError: print("!!! Still no DB connection string.") - exit() + sys.exit(1) finally: os.environ["PYPE_MONGO"] = pype_mongo @@ -253,8 +253,13 @@ def boot(): # Find Pype versions # ------------------------------------------------------------------------ + pype_version = None pype_versions = bootstrap.find_pype(include_zips=True) - pype_version = pype_versions[-1] + try: + pype_version = pype_versions[-1] + except IndexError: + # no pype version found + pass if getattr(sys, 'frozen', False): if not pype_versions: @@ -285,6 +290,8 @@ def boot(): "latest available")) # specified version was not found so use latest detected. version_path = pype_version.path + print(f">>> Using version [ {pype_version} ]") + print(f" From {version_path}") # test if latest detected is installed (in user data dir) is_inside = False @@ -301,7 +308,12 @@ def boot(): version_path = bootstrap.install_version( pype_version, force=True) + if pype_version.path.is_file(): + print(">>> Extracting zip file ...") + version_path = bootstrap.extract_pype(pype_version) + # inject version to Python environment (sys.path, ...) + print(">>> Injecting Pype version to running environment ...") bootstrap.add_paths_from_directory(version_path) # add stuff from `/lib` to PYTHONPATH. @@ -355,7 +367,6 @@ def boot(): from pype.lib import terminal as t from pype.version import __version__ print(">>> loading environments ...") - set_environments() set_modules_environments() info = get_info()