This is a sweep to remove bad inclusive terms like master. Also testing functionality.

2021-04-22 16:13:23 -05:00
parent 3fd7649a9f
commit 50abfbb3f5
17 changed files with 313 additions and 230 deletions
@@ -29,7 +29,10 @@ import collections
 from collections import abc
 # import subprocess
 import logging as _logging
-import pathlib
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
 from pathlib import *
 import shelve
 # import socket
@@ -17,8 +17,14 @@


 import logging as _logging
+
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
+
 from pathlib import Path
-import pathlib
+
 from box import Box
 import os

@@ -62,15 +62,15 @@ _LOGGER.debug('Invoking:: {0}.'.format({_MODULENAME}))
 # To Do: move the callback key like 'NewSceneOpened' here (instead of None)
 # ^ this would provide ability to loop through and replace key with CB object

-_G_callbacks = Box(box_dots=True)  # global scope container
-_G_masterkey = 'DCCsi_callbacks'
-_G_callbacks[_G_masterkey] = True  # required master key
+_G_CALLBACKS = Box(box_dots=True)  # global scope container
+_G_PRIMEKEY = 'DCCsi_callbacks'
+_G_CALLBACKS[_G_PRIMEKEY] = True  # required prime key


 # -------------------------------------------------------------------------
-def init_callbacks(_callbacks=_G_callbacks):
+def init_callbacks(_callbacks=_G_CALLBACKS):
    # store as a dict (Box is a fancy dict)
-    _callbacks[_G_masterkey] = True  # required master key
+    _callbacks[_G_PRIMEKEY] = True  # required prime key
    
    # signature dict['callback key'] = ('CallBack'(type), func, callbackObj)
    _callbacks['on_new_file'] = ['NewSceneOpened', set_defaults, None]
@@ -96,24 +96,24 @@ def uninstall_callbacks():
    """Bulk uninstalls hte globally defined set of callbacks:
    _G_callbacks"""

-    global _G_callbacks
+    global _G_CALLBACKS

    _LOGGER.debug('uninstall_callbacks() fired')

-    for key, value in _G_callbacks:
+    for key, value in _G_CALLBACKS:
        if value[2] is not None:  # have a cb
            value[2].uninstall()  # so uninstall it
        else:
            _LOGGER.warning('No callback in: key {0}, value:{1}'
                            ''.format(key, value))
-    _G_callbacks = None
+    _G_CALLBACKS = None
    _LOGGER.info('DCCSI CALLBACKS UNINSTALLED ... EXITING')
-    return _G_callbacks
+    return _G_CALLBACKS
 # -------------------------------------------------------------------------


 # -------------------------------------------------------------------------
-def install_callbacks(_callbacks=_G_callbacks):
+def install_callbacks(_callbacks=_G_CALLBACKS):
    """Bulk installs the globally defined set of callbacks:
    _G_callbacks"""
    
@@ -126,15 +126,15 @@ def install_callbacks(_callbacks=_G_callbacks):
        _callbacks.pop('box_dots')

    # don't pass anything but carefully considered dict
-    if _G_masterkey in _callbacks:
-        _masterkey = _callbacks.pop(_G_masterkey)
+    if _G_PRIMEKEY in _callbacks:
+        _primekey = _callbacks.pop(_G_PRIMEKEY)
    else:
-        _LOGGER.error('No master key, use a correct dictionary')
+        _LOGGER.error('No prime key, use a correct dictionary')
        #To Do: implement error handling and return codes
        return _callbacks[None]

-    for key, value in _G_callbacks.items():
-        # we popped the master key should the rest should be safe
+    for key, value in _G_CALLBACKS.items():
+        # we popped the prime key should the rest should be safe
        if value[0] != 'nodeMessageType':
            # set callback up
            _cb = azEvCbH.EventCallbackHandler(value[0],
@@ -195,10 +195,10 @@ def update_workspace(foo=None):
 # -------------------------------------------------------------------------

 # install and init callbacks on an import obj
-_G_callbacks = install_callbacks(_G_callbacks)
+_G_CALLBACKS = install_callbacks(_G_CALLBACKS)

 # ==========================================================================
 # Module Tests
 #==========================================================================
 if __name__ == '__main__':
-    _G_callbacks = install_callbacks(_G_callbacks)
+    _G_CALLBACKS = install_callbacks(_G_CALLBACKS)
@@ -262,9 +262,9 @@ def post_startup():

    # callbacks, To Do: these should also be moved to the bootstrapping config
    # Defered startup after the Ui is running.
-    _G_callbacks = Box(box_dots=True)  # this just ensures a global scope container
+    _G_CALLBACKS = Box(box_dots=True)  # this just ensures a global scope container
    if _G_LOAD_CALLBACKS:
-        from set_callbacks import _G_callbacks
+        from set_callbacks import _G_CALLBACKS
        # ^ need to hold on to this as the install repopulate set

    # this ensures the fixPaths callback is loaded
@@ -74,7 +74,9 @@ Now your local maya install is all set up with pip so you can install additional

 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 Lumberyard(O3DE) install.
-And you'll need to know where the DCCsi, we will install package dependancies there.
+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.

-C:\Program Files\Autodesk\Maya2020\bin>mayapy -m pip install -r C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\requirements.txt -t C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
+Note: you may need to update the paths below to match your local o3de engine install!
+
+C:\Program Files\Autodesk\Maya2020\bin>mayapy -m pip install -r C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\requirements.txt -t C:\Depot\o3de\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib\2.x\2.7.x\site-packages
@@ -4,12 +4,14 @@
 #
 #    pip-compile --generate-hashes requirements.txt
 #
-typing==3.7.4.3 \
-    --hash=sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 \
-    --hash=sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5
-    # via
-    #   -r requirements.txt
-    #   dynaconf
+cachetools==3.1.1 \
+    --hash=sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae \
+    --hash=sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
+    # via -r requirements.txt
+certifi==2020.6.20 \
+    --hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \
+    --hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41
+    # via -r requirements.txt
 click==7.1.2 \
    --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
    --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
@@ -20,6 +22,14 @@ dynaconf==3.1.4 \
    --hash=sha256:b2f472d83052f809c5925565b8a2ba76a103d5dc1dbb9748b693ed67212781b9 \
    --hash=sha256:e6f383b84150b70fc439c8b2757581a38a58d07962aa14517292dcce1a77e160
    # via -r requirements.txt
+hashids==1.3.1 \
+    --hash=sha256:6c3dc775e65efc2ce2c157a65acb776d634cb814598f406469abef00ae3f635c \
+    --hash=sha256:8bddd1acba501bfc9306e7e5a99a1667f4f2cacdc20cbd70bcc5ddfa5147c94c
+    # via -r requirements.txt
+pathlib2==2.3.5 \
+    --hash=sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db \
+    --hash=sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868
+    # via -r requirements.txt
 pathlib==1.0.1 \
    --hash=sha256:6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f
    # via -r requirements.txt
@@ -27,7 +37,38 @@ python-box==3.4.6 \
    --hash=sha256:694a7555e3ff9fbbce734bbaef3aad92b8e4ed0659d3ed04d56b6a0a0eff26a9 \
    --hash=sha256:a71d3dc9dbaa34c8597d3517c89a8041bd62fa875f23c0f3dad55e1958e3ce10
    # via -r requirements.txt
+scandir==1.10.0 \
+    --hash=sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e \
+    --hash=sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022 \
+    --hash=sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f \
+    --hash=sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f \
+    --hash=sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae \
+    --hash=sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173 \
+    --hash=sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4 \
+    --hash=sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32 \
+    --hash=sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188 \
+    --hash=sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d \
+    --hash=sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac
+    # via
+    #   -r requirements.txt
+    #   pathlib2
+six==1.15.0 \
+    --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
+    --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced
+    # via
+    #   -r requirements.txt
+    #   pathlib2
+typing==3.7.4.3 \
+    --hash=sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 \
+    --hash=sha256:283d868f5071ab9ad873e5e52268d611e851c870a2ba354193026f2dfb29d8b5
+    # via
+    #   -r requirements.txt
+    #   dynaconf
 unipath==1.1 \
    --hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \
    --hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7
    # via -r requirements.txt
+wincertstore==0.2 \
+    --hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \
+    --hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a
+    # via -r requirements.txt