Merge branch 'develop' into bugfix/AY-3892_3dsMax-refactor-save-max-file

client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py

@@ -172,7 +172,7 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin):
         """Collects inputs from nodes in renderlayer, incl. shaders + camera"""
 
         # Get the renderlayer
-        renderlayer = instance.data.get("renderlayer")
+        renderlayer = instance.data.get("setMembers")
 
         if renderlayer == "defaultRenderLayer":
             # Assume all loaded containers in the scene are inputs

client/ayon_core/lib/__init__.py

@@ -161,12 +161,6 @@ from .ayon_info import (
     is_in_tests,
 )
 
-
-from .connections import (
-    requests_get,
-    requests_post
-)
-
 terminal = Terminal
 
 __all__ = [
@@ -283,7 +277,4 @@ __all__ = [
     "is_staging_enabled",
     "is_dev_mode_enabled",
     "is_in_tests",
-
-    "requests_get",
-    "requests_post"
 ]

client/ayon_core/lib/connections.py

@@ -1,38 +0,0 @@
-import requests
-import os
-
-
-def requests_post(*args, **kwargs):
-    """Wrap request post method.
-
-    Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-    variable is found. This is useful when Deadline server is
-    running with self-signed certificates and its certificate is not
-    added to trusted certificates on client machines.
-
-    Warning:
-        Disabling SSL certificate validation is defeating one line
-        of defense SSL is providing, and it is not recommended.
-
-    """
-    if "verify" not in kwargs:
-        kwargs["verify"] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
-    return requests.post(*args, **kwargs)
-
-
-def requests_get(*args, **kwargs):
-    """Wrap request get method.
-
-    Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-    variable is found. This is useful when Deadline server is
-    running with self-signed certificates and its certificate is not
-    added to trusted certificates on client machines.
-
-    Warning:
-        Disabling SSL certificate validation is defeating one line
-        of defense SSL is providing, and it is not recommended.
-
-    """
-    if "verify" not in kwargs:
-        kwargs["verify"] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
-    return requests.get(*args, **kwargs)

client/ayon_core/modules/deadline/abstract_submit_deadline.py

@@ -29,6 +29,10 @@ from ayon_core.pipeline.publish.lib import (
 JSONDecodeError = getattr(json.decoder, "JSONDecodeError", ValueError)
 
 
+# TODO both 'requests_post' and 'requests_get' should not set 'verify' based
+#   on environment variable. This should be done in a more controlled way,
+#   e.g. each deadline url could have checkbox to enabled/disable
+#   ssl verification.
 def requests_post(*args, **kwargs):
     """Wrap request post method.
 

client/ayon_core/modules/deadline/deadline_module.py

@@ -1,9 +1,10 @@
 import os
-import requests
-import six
 import sys
 
-from ayon_core.lib import requests_get, Logger
+import requests
+import six
+
+from ayon_core.lib import Logger
 from ayon_core.modules import AYONAddon, IPluginPaths
 
 
@@ -56,6 +57,8 @@ class DeadlineModule(AYONAddon, IPluginPaths):
             RuntimeError: If deadline webservice is unreachable.
 
         """
+        from .abstract_submit_deadline import requests_get
+
         if not log:
             log = Logger.get_logger(__name__)