Explorar el Código

cleanup and readme update

Signed-off-by: Jonny Galloway <[email protected]>
Jonny Galloway hace 3 años
padre
commit
dce1fa72a7

+ 82 - 0
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Env_Dev.bat.example

@@ -0,0 +1,82 @@
+@echo off
+
+REM
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+echo.
+echo _____________________________________________________________________
+echo.
+echo ~    O3DE DCCsi Env Dev ...
+echo _____________________________________________________________________
+echo.
+echo ~    local env settings
+echo.
+
+:: These are local overrides for developers launching the dev environment
+:: Using the .bat files (for windows)
+
+:: You can make similar overrides that propogate via python, by creating
+:: and editing a settings.local.json file with these values
+
+:: propogate additional envars into the dev environment
+set O3DE_BUILD_FOO=True
+echo     O3DE_BUILD_FOO = %O3DE_BUILD_FOO%
+
+:: set the location of the engine root
+set O3DE_DEV=C:\depot\o3de-dev
+echo     O3DE_DEV = %O3DE_DEV%
+
+:: if you are a developer and working in an engine-centric way
+:: this will set the folder you build into
+set O3DE_BUILD_FOLDER=build
+echo     O3DE_BUILD_FOLDER = %O3DE_BUILD_FOLDER%
+
+:: build out a path to the build and bin folder
+set PATH_O3DE_BUILD=%O3DE_DEV%\%O3DE_BUILD_FOLDER%
+echo     PATH_O3DE_BUILD = %PATH_O3DE_BUILD%
+
+set PATH_O3DE_BIN=%PATH_O3DE_BUILD%\bin\profile
+echo     PATH_O3DE_BIN = %PATH_O3DE_BIN%
+
+:: or you can just set the bin folder
+:: this is the sdk installer path 
+::set PATH_O3DE_BIN=C:\O3DE\0.0.0.0\bin\Windows\profile\Default
+:echo     PATH_O3DE_BIN = %PATH_O3DE_BIN%
+
+:: enables additional debug behaviour in code
+set DCCSI_GDEBUG=True
+echo     DCCSI_GDEBUG = %DCCSI_GDEBUG%
+
+:: enables additional developer behaviours like auto-attach debugger
+set DCCSI_DEV_MODE=True
+echo     DCCSI_DEV_MODE = %DCCSI_DEV_MODE%
+
+:: enables which debugger to use
+:: currently only wing is supported
+set DCCSI_GDEBUGGER=WING
+echo     DCCSI_GDEBUGGER = %DCCSI_GDEBUGGER%
+
+:: Default level logger will handle
+:: Override this to control the setting
+:: CRITICAL:50
+:: ERROR:40
+:: WARNING:30
+:: INFO:20
+:: DEBUG:10
+:: NOTSET:0
+set DCCSI_LOGLEVEL=10
+echo     DCCSI_LOGLEVEL = %DCCSI_LOGLEVEL%
+
+:: Set your preferred defualt Maya and Python version
+set MAYA_VERSION=2023
+set DCCSI_PY_VERSION_MAJOR=3
+set DCCSI_PY_VERSION_MINOR=9
+set DCCSI_PY_VERSION_RELEASE=7
+
+:: and you can alter the install path
+set MAYA_LOCATION=%ProgramFiles%\Autodesk\Maya%MAYA_VERSION%

+ 0 - 8
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/__init__.py

@@ -46,11 +46,3 @@ from DccScriptingInterface import PATH_O3DE_TECHART_GEMS
 from DccScriptingInterface import PATH_DCCSIG
 from DccScriptingInterface.Tools import PATH_DCCSI_TOOLS
 from DccScriptingInterface.globals import *
-
-
-# dev mode will enable nested import tests
-if DCCSI_DEV_MODE:
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    # If in dev mode this will test imports of __all__
-    _LOGGER.debug(f'Testing Imports from {_PACKAGENAME}')
-    test_imports(_all=__all__, _pkg=_PACKAGENAME, _logger=_LOGGER)

+ 103 - 26
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/readme.md

@@ -1,16 +1,81 @@
----
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# DCCsi.Tools.DCC.Maya
 
-SPDX-License-Identifier: Apache-2.0 OR MIT
----
+The "DccScriptingInterface" (aka DCCsi) is a Gem for O3DE to extend and interface with dcc tools in the python ecosystem.  This document contains the details of configuration of Maya as a DCC tool to be used with O3DE.
+
+###### Status: Prototype
+
+###### Version: 0.0.1
+
+###### OS: Windows only (for now)
+
+###### Support:
+
+- Maya 2022 w/ Python3 (will not support py2.7)
+
+- Maya 2023+ w/ Python3 <-- default version
+
+## Setup
+
+You should enable the DCCsi Gem in your project, this can be done with 'Configure Gems' in the O3DE Project Manager (o3de.exe). This will enable a 'Studio Tools' menu within the O3DE Editor.exe from which some DCC tools can be launched. (*Note: Maya support to start from o3de menus is not yet implemented*.)  Before launching Maya for O3DE for the first time, you should follow the steps outlined below.
+
+## Configure Maya (TL/DR)
+
+Before the O3DE DCCsi tools will operate correctly in Maya, you will need to install the python package dependencies:
+
+    1. Open a Windows Command Prompt (CMD)
+
+    2. Change directory to: 
+
+```batch
+cd C:\path\to\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface
+```
+
+    3. Run the DCCsi foundation.py script with a target to the mayapy.exe of the vision you want to configure:
+
+```batch
+python foundation.py -py=C:\Program Files\Autodesk\Maya2023\bin\mayapy.exe"
+```
+
+This will install a version of all of the package dependencies into a folder such as the following, where the DCCsi will add them as a site-package based on the DCC tools version of python.
+
+`DccScriptingInterface\3rdParty\Python\Lib\3.x\3.9.x\site-packages\*`
+
+Since each DCC app, may be on a slightly different version of python, you may find more then one set of installed packages within that 3rdParty location, one for each version of python (the intent here is to maximize compatibility.)
+
+## Configure Maya Externally (Optional)
 
-# <u>DCCsi.Tools.DCC.Maya.Readme</u>
+The DCCsi assumes that DCC tools such as Maya are installed within their default install location, for Maya that usually would be:
 
-"DccScriptingInterface" (aka DCCsi) is a Gem for O3DE to extend and interface with dcc tools in the python ecosystem. Each dcc tool may have it's own specific version of python. Most are some version of py3+. O3DE provides an install of py3+ and manages package dependancies with requirements.txt files and the cmake build system.
+    `C:\Program Files\Autodesk\Maya2022`        
 
-However Autodesk Maya 2020 (and earlier) still uses a version of py2.7
-so we need an alternate way to deal with package management for some DCC tools.
+    `C:\Program Files\Autodesk\Maya2023`
+
+If you'd like to use Maya with O3DE bootstrapped tools externally, outside of the o3de Editor, you can do that also.  There two ways, a windows environment via .bat file, or a start.py script (*DCCsi\Tools\DCC\Maya\start.py is not implemented yet*.)
+
+The DCCsi defaults to Maya 2023, and the default install location. We understand teams may want to use a specific version of maya, or may maintain a customized maya container, or IT managed install location.  If you want to alter the version, or the install location, you'll also want follow these instructions:
+
+The Maya env can be modified by adding this file:
+
+`"C:\path\tp\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\DCC\Maya\Env_Dev.bat"`
+
+Inside of that you can set/override envars to change the Maya version, it's python version information, as well as your custom install path.  Here is an example of those envars:
+
+```batch
+:: Set your preferred defualt Maya and Python version
+set MAYA_VERSION=2023
+set DCCSI_PY_VERSION_MAJOR=3
+set DCCSI_PY_VERSION_MINOR=9
+set DCCSI_PY_VERSION_RELEASE=7
+
+:: and you can alter the install path
+set MAYA_LOCATION=%ProgramFiles%\Autodesk\Maya%MAYA_VERSION%
+```
+
+A future PR will add an additional settings.json, and settings.local.json within the o3de DCCsi folder for Maya, this will coincide with the addition of a config.py and start.py, to follow the patterns similar to how Blender can be launched from the O3DE menus, or in a scripted manner rather then legacy windows .bat files.
+
+## Additional Information
+
+Each dcc tool likely has it's own design and architecture that is often not common, and many have it's own specific version of python. Most are some version of py3+. O3DE provides an install of py3+ and manages package dependencies with requirements.txt files and the cmake build system.  If you prefer not to use out included foundation.py script, the details below will walk you through haw you can manually configure on your own.
 
 Maya ships with it's own python interpreter called mayapy.exe
 
@@ -22,18 +87,19 @@ The python install and site-packages are here:
 
 A general goal of the DCCsi is be self-maintained, and to not taint the users installed applications of environment.
 
-So we boostrap additional access to site-packages in our userSetup.py:
+So as to not directly modify Maya, we bootstrap additional access to site-packages in our userSetup.py:
+
 `"C:/Depot/o3de/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Scripts/userSetup.py"`
 
-We don't want users to have to install or use Python2.7 although with maya and possibly other dcc tools we don't have that control.  Maya 2020 and earlier versions are still on Python2.7, so instead of forcing another install of python we can just use mayapy to manage extensions.
+We don't want users to have to install or use any additional version of Python, especially use of legacy versions such as python2.7, although with older versions of  Maya and possibly other dcc tools we don't have that control.  Maya 2020 and earlier versions are still on Python2.7, so instead of forcing another install of python we can just use that versions mayapy to manage its extensions.
 
-Pip may already be installed, you can check like so (your maya install path may be different):
+Pip may already be installed, you can check like so (your Maya install path may be different):
 
 `C:\Program Files\Autodesk\Maya2020\bin>mayapy -m pip --version`
 
-Another way to check is: `mayapy.exe -m ensurepip`
+Another way to ensure pip exists is: `mayapy.exe -m ensurepip` 
 
-If pip is not available yet for your mayapy, there are a couple ways to address this.
+If pip is not available in your maya install for whatever reason, there are a couple ways to go about addressing this.
 
 ## Method 1, use get-pip
 
@@ -95,30 +161,35 @@ This command will ensure that pip is installed
 
     mayapy -m ensurepip
 
-This command will upgrade pip (for instance if a secutiry patch is released)
+This command will upgrade pip (for instance if a security patch is released)
 
     mayapy -m ensurepip --upgrade
 
-Now your local maya install is all set up with pip so you can install additional python packages to use in maya.  (note: not all packages are compatible with maya)
+Now your local Maya install is all set up with pip so you can install additional python packages to use in Maya.  (note: not all python packages are compatible with Maya)
+
+Now you will want to complete the following instructions to finish setup...
 
-Now you will want to run the following file to finish setup...
+We have a `requirements.txt`file with the extension packages we use in the DCCsi.
+You'll need the repo/branch path of your O3DE install.  And you'll need to know where the DCCsi is located, we will install package dependencies in a path such as (based on python version):
 
-We have a requirements.txt file with the extension packages we use in the DCCsi.
-You'll need the repo/branch path of your O3DE (aka Lumberyard) install.
-And you'll need to know where the DCCsi is located, we will install package dependancies there.
+   ` DccScriptingInterface\3rdParty\Python\Lib\3.x\3.9.x\site-packages`
 
 Note: you may need to update the paths below to match your local o3de engine install!
 
-This is py2.7 requirements: DccScriptingInterface\Tools\DCC\Maya\requirements.txt
+This is where the legacy py2.7 version of requirements is stored: `"C:\path\to\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Resources\py27\requirements.txt"`
 
-The following will install those requirements into a sandbox area that we can boostrap in DCC tools running py2.7
+The following will install those requirements into a sandbox area that we can bootstrap in DCC tools running py2.7
 
-C:\Program Files\Autodesk\Maya2020\bin>
+`C:\Program Files\Autodesk\Maya2020\bin>`
 
-    mayapy -m pip install -r C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\DCC\Maya\requirements.txt -t C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
+```batch
+mayapy -m pip install -r C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\DCC\Maya\requirements.txt -t C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
+```
 
 ![image](https://user-images.githubusercontent.com/23222931/155037696-cab81e13-7910-433d-b038-75a07e6690ad.png)
 
+Note: These days most of the DCCsi has be written or refactored for Python3+ syntax, although it is technically possible to write code that is py2.7 and py3 compatible, we have not taken the time to do so (python2.7 is end of life, and Maya 2022+ now comes with python3).  This information is here mainly for historical context, you may be able to modify the code yourself to patch in python 2.7 support if you are working with an older version of Maya.
+
 ## Other versions of Maya (2022 and beyond)
 
 Maya 2022 finally brings us to Python3, however to facilitate the transition Maya 2022 also has a backwards compatible implementation of Py2.7 (effectively it has support for both py2.7 and py3.7) 
@@ -140,11 +211,11 @@ This command will ensure that pip is installed
 
     C:\Program Files\Autodesk\Maya2020\bin>mayapy2 -m ensurepip
 
-This command will upgrade pip (for instance if a secutiry patch is released)
+This command will upgrade pip (for instance if a security patch is released)
 
     C:\Program Files\Autodesk\Maya2020\bin>mayapy2 -m ensurepip --upgrade
 
-The following will install those requirements into a sandbox area that we can boostrap in DCC tools running py2.7
+The following will install those requirements into a sandbox area that we can bootstrap in DCC tools running py2.7
 
     mayapy2 -m pip install -r C:\Depot\o3de-dev\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\DCC\Maya\requirements.txt -t C:\Depot\o3de-dev\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
 
@@ -173,3 +244,9 @@ The following will install those requirements into a sandbox area that we can bo
     mayapy -m pip install -r C:\Depot\o3de-dev\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\requirements.txt -t C:\Depot\o3de-dev\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\3.x\3.10.x\site-packages
 
 ![image](https://user-images.githubusercontent.com/23222931/155037723-8f514a85-194f-46e8-b726-55a04f0860bb.png)
+
+```yaml
+Copyright (c) Contributors to the Open 3D Engine Project.For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+```

+ 2 - 2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/win_launch_maya.bat

@@ -41,9 +41,9 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 IF EXIST "%~dp0Env_Dev.bat" CALL %~dp0Env_Dev.bat
 
 :: Default Maya and Python version
-IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2022)
+IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2023)
 IF "%DCCSI_PY_VERSION_MAJOR%"=="" (set DCCSI_PY_VERSION_MAJOR=3)
-IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=7)
+IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=9)
 IF "%DCCSI_PY_VERSION_RELEASE%"=="" (set DCCSI_PY_VERSION_RELEASE=7)
 
 :: Constant Vars (Global)

+ 0 - 8
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/__init__.py

@@ -56,11 +56,3 @@ PATH_DCCSI_TOOLS_DCC = Path(os.getenv(ENVAR_PATH_DCCSI_TOOLS_DCC,
 add_site_dir(PATH_DCCSI_TOOLS_DCC.as_posix())
 _LOGGER.debug(f'{ENVAR_PATH_DCCSI_TOOLS_DCC}: {PATH_DCCSI_TOOLS_DCC}')
 _LOGGER.debug(STR_CROSSBAR)
-
-
-# dev mode will enable nested import tests
-if DCCSI_DEV_MODE:
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    # If in dev mode this will test imports of __all__
-    _LOGGER.debug(f'Testing Imports from {_PACKAGENAME}')
-    test_imports(_all=__all__,_pkg=_PACKAGENAME,_logger=_LOGGER)

+ 2 - 2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Dev/Windows/Env_DCC_Maya.bat

@@ -24,11 +24,11 @@ PUSHD %~dp0
 
 :: Maya 2022: 3.7.7 (tags/v3.7.7:d7c567b08f, Mar 10 2020, 10:41:24) [MSC v.1900 64 bit (AMD64)]
 IF "%DCCSI_PY_VERSION_MAJOR%"=="" (set DCCSI_PY_VERSION_MAJOR=3)
-IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=7)
+IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=9)
 IF "%DCCSI_PY_VERSION_RELEASE%"=="" (set DCCSI_PY_VERSION_RELEASE=7)
 
 :: Default Maya Version
-IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2022)
+IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2023)
 
 :: Initialize env
 CALL %~dp0\Env_O3DE_Core.bat

+ 1 - 1
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/IDE/Wing/.solutions/DCCsi_8x.wpr

@@ -214,7 +214,7 @@ proj.launch-config = {loc('../../../../../../../../../sample-code-gems/py_gems/P
                       loc('../../../DCC/Blender/start.py'): ('project',
         ('',
          'launch-H3gT8EPtxXR6YyOq')),
-                      loc('../../../DCC/Maya/Scripts/Python/Export/materials.py'): ('project',
+                      loc('../../../DCC/Maya/Scripts/Python/export/materials.py'): ('project',
         ('',
          'launch-H3gT8EPtxXR6YyOq')),
                       loc('../../../DCC/Maya/Scripts/userSetup.py'): ('project',

+ 0 - 7
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/__init__.py

@@ -35,10 +35,3 @@ from DccScriptingInterface.globals import *
 _MODULE_PATH = Path(__file__)  # To Do: what if frozen?
 _LOGGER.debug(f'_MODULE_PATH: {_MODULE_PATH}')
 
-
-# dev mode will enable nested import tests
-if DCCSI_DEV_MODE:
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    # If in dev mode this will test imports of __all__
-    _LOGGER.debug(f'Testing Imports from {_PACKAGENAME}')
-    test_imports(_all=__all__,_pkg=_PACKAGENAME,_logger=_LOGGER)

+ 0 - 6
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/__init__.py

@@ -28,9 +28,3 @@ from DccScriptingInterface.globals import *
 _MODULE_PATH = Path(__file__)  # To Do: what if frozen?
 _LOGGER.debug(f'_MODULE_PATH: {_MODULE_PATH}')
 
-# dev mode will enable nested import tests
-if DCCSI_DEV_MODE:
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    # If in dev mode this will test imports of __all__
-    _LOGGER.debug(f'Testing Imports from {_PACKAGENAME}')
-    test_imports(_all=__all__, _pkg=_PACKAGENAME, _logger=_LOGGER)

+ 17 - 35
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/common/envar_utils.py

@@ -11,15 +11,11 @@
 from __future__ import unicode_literals
 
 # -------------------------------------------------------------------------
-'''
-Module: <DCCsi>\\azpy\\shared\\common\\config_utils.py
-
-    A set of utility functions
+'''! A set of utility functions for enavrs
 
-    <to do: further document this module>
-    
-    To Do:
-        ATOM-5859
+:file: < DCCsi >/azpy/shared/common/envar_utils.py
+:Status: Prototype
+:Version: 0.0.1
 '''
 # -------------------------------------------------------------------------
 
@@ -38,26 +34,12 @@ from unipath import Path
 
 # -------------------------------------------------------------------------
 #  global space
-import azpy.env_bool as env_bool
-from azpy.constants import ENVAR_O3DE_DEV
-from azpy.constants import ENVAR_O3DE_PROJECT
-from azpy.constants import ENVAR_DCCSI_GDEBUG
-from azpy.constants import ENVAR_DCCSI_DEV_MODE
-from azpy.constants import FRMT_LOG_LONG
-
-_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
-_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
-
-_MODULENAME = __name__
-if _MODULENAME is '__main__':
-    _MODULENAME = 'azpy.shared.common.envar_utils'
-
-# set up module logging
-for handler in _logging.root.handlers[:]:
-    _logging.root.removeHandler(handler)
-_LOGGER = _logging.getLogger(_MODULENAME)
-_logging.basicConfig(format=FRMT_LOG_LONG)
-_LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
+from DccScriptingInterface.azpy.shared import _PACKAGENAME
+_PACKAGENAME = f'{_PACKAGENAME}.envar_utils'
+_LOGGER = _logging.getLogger(_PACKAGENAME)
+_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
+
+from DccScriptingInterface.globals import *
 # -------------------------------------------------------------------------
 
 
@@ -80,9 +62,9 @@ def get_envar_default(envar, envar_default=None, envar_set=Box(ordered_box=True)
     :param var:
     :return: Some value for the variable, current or default.
     '''
-    
+
     from pathlib import Path
-    
+
     envar = str(envar)
     value = os.getenv(envar, envar_default)
     if not value:
@@ -100,9 +82,9 @@ def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_O3DE_DEV)):
     Must be safe, will not over-write existing.
     :return: envarSet
     """
-    
+
     from pathlib import Path
-    
+
     if env_root:
         env_root = Path(env_root)
 
@@ -116,7 +98,7 @@ def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_O3DE_DEV)):
         envar = str(envar)
         value = os.getenv(envar)
 
-        if _DCCSI_GDEBUG:
+        if DCCSI_GDEBUG:
             if not value:
                 _LOGGER.debug('~ EnVar value NOT found: {0}\r'.format(envar))
 
@@ -182,7 +164,7 @@ class Validate_Envar(object):
 if __name__ == '__main__':
     # imports for local testing
     import json
-    
+
     # srun simple tests?
     test = True
 
@@ -205,7 +187,7 @@ if __name__ == '__main__':
     #  try to fetch and set the base values from the environment
     #  this makes sure all envars set, are resolved on import
     TEST_ENV_VALUES = set_envar_defaults(TEST_ENV_VALUES)
-    
+
     _LOGGER.info('Pretty print: TEST_ENV_VALUES')
     print(json.dumps(TEST_ENV_VALUES,
                      indent=4, sort_keys=False,

+ 0 - 10
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/noodely/__init__.py

@@ -97,16 +97,6 @@ def tests():
     return
 
 
-# -------------------------------------------------------------------------
-if DCCSI_DEV_MODE:
-    # If in dev mode this will test imports of __all__
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    _LOGGER.debug('Testing Imports from {0}'.format(_PACKAGENAME))
-    test_imports(__all__,
-                 _pkg=_PACKAGENAME,
-                 _logger=_LOGGER)
-
-
 ###########################################################################
 # --call block-------------------------------------------------------------
 if __name__ == "__main__":

+ 0 - 10
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/__init__.py

@@ -61,13 +61,3 @@ if DCCSI_TEST_PYSIDE:
 
     if PYSIDE2_TOOLS:
         __all__.append('puic_utils')
-
-
-# -------------------------------------------------------------------------
-if DCCSI_DEV_MODE:
-    # If in dev mode this will test imports of __all__
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    _LOGGER.debug('Testing Imports from {0}'.format(_PACKAGENAME))
-    test_imports(__all__,
-                 _pkg=_PACKAGENAME,
-                 _logger=_LOGGER)

+ 0 - 7
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/utils/__init__.py

@@ -32,10 +32,3 @@ from DccScriptingInterface.globals import *
 
 _MODULE_PATH = Path(__file__)  # To Do: what if frozen?
 _LOGGER.debug(f'_MODULE_PATH: {_MODULE_PATH}')
-
-# dev mode will enable nested import tests
-if DCCSI_DEV_MODE:
-    from DccScriptingInterface.azpy.shared.utils.init import test_imports
-    # If in dev mode this will test imports of __all__
-    _LOGGER.debug(f'Testing Imports from {_PACKAGENAME}')
-    test_imports(_all=__all__,_pkg=_PACKAGENAME,_logger=_LOGGER)

+ 2 - 12
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/python.cmd

@@ -57,18 +57,8 @@ echo     PATH_O3DE_TECHART_GEMS = %PATH_O3DE_TECHART_GEMS%
 IF "%PATH_DCCSIG%"=="" (set "DccScriptingInterface")
 echo     PATH_DCCSIG = %PATH_DCCSIG%
 
-set "QT_BIN_DIR=packages\qt-5.15.2-rev7-windows\qt\bin"
-
-IF "%QT_PLUGIN_PATH%"=="" (set "QT_PLUGIN_PATH=%PATH_O3DE_3RDPARTY%\%QT_BIN_DIR%")
-echo     QT_PLUGIN_PATH = %QT_PLUGIN_PATH%
-
-set "QTPY_PKG_DIR=packages\pyside2-5.15.2.1-py3.10-rev3-windows\pyside2\lib\site-packages"
-
-IF "%QTFORPYTHON_PATH%"=="" (set "QTFORPYTHON_PATH=%PATH_O3DE_3RDPARTY%\%QTPY_PKG_DIR%")
-echo     QTFORPYTHON_PATH = %QTFORPYTHON_PATH%
-
-SET PATH=%QT_PLUGIN_PATH%;%O3DE_DEV%;%PATH_O3DE_TECHART_GEMS%;%PATH_DCCSIG%;%PATH%
-SET PYTHONPATH=%PATH_O3DE_TECHART_GEMS%;%PATH_DCCSIG%;%PYTHONPATH%
+SET PATH=%O3DE_DEV%;%PATH_O3DE_TECHART_GEMS%;%PATH_DCCSIG%;%PATH%
+SET PYTHONPATH=%O3DE_DEV%;%PATH_O3DE_TECHART_GEMS%;%PATH_DCCSIG%;%PYTHONPATH%
 
 :: get the o3de python home
 FOR /F "tokens=* USEBACKQ" %%F IN (`%O3DE_PYTHON%\python.cmd %O3DE_PYTHON%\get_python_path.py`) DO (SET O3DE_PYTHONHOME=%%F)