Merge pull request #5927: Pants: add some missing external dependencies

cognifloyd · web-flow · commit a43c70b92a34 · 2023-03-10T10:36:32.000-06:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,7 +16,7 @@ Added
   to pants' use of PEX lockfiles. This is not a user-facing addition.
   #5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850
   #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 #5864 #5874 #5884 #5893 #5891
-  #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926
+  #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922 #5926 #5927
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/lockfiles/st2.lock b/lockfiles/st2.lock
diff --git a/st2actions/conf/BUILD b/st2actions/conf/BUILD
@@ -6,6 +6,13 @@ file(
 files(
     name="logging",
     sources=["logging*.conf"],
+    overrides={
+        "logging.conf": {
+            "dependencies": [
+                "//:reqs#python-json-logger",
+            ],
+        },
+    },
 )
 
 files(
diff --git a/st2client/BUILD b/st2client/BUILD
@@ -5,4 +5,13 @@ st2_component_python_distribution(
             "st2": "st2client.shell:main",
         },
     },
+    dependencies=[
+        # required for SOCKS proxy support (HTTP_PROXY, HTTPS_PROXY, NO_PROXY)
+        ":pysocks",
+    ],
+)
+
+python_requirement(
+    name="pysocks",
+    requirements=["pysocks"],
 )
diff --git a/st2common/st2common/util/BUILD b/st2common/st2common/util/BUILD
@@ -1 +1,8 @@
 python_sources()
+
+# st2common.utils.concurrency allows using gevent instead of eventlet.
+# This gevent support is WIP.
+# python_requirement(
+#    name="gevent",
+#    requirements=["gevent"],
+# )
diff --git a/st2common/st2common/util/concurrency.py b/st2common/st2common/util/concurrency.py
@@ -26,7 +26,7 @@
     eventlet = None
 
 try:
-    import gevent  # pylint: disable=import-error
+    import gevent  # pylint: disable=import-error # pants: no-infer-dep
     import gevent.pool
 except ImportError:
     gevent = None
diff --git a/st2common/st2common/util/monkey_patch.py b/st2common/st2common/util/monkey_patch.py
@@ -56,6 +56,7 @@ def monkey_patch(patch_thread=None):
     if patch_thread is None:
         patch_thread = not is_use_debugger_flag_provided()
 
+    # TODO: support gevent.patch_all if .concurrency.CONCURRENCY_LIBRARY = "gevent"
     eventlet.monkey_patch(
         os=True, select=True, socket=True, thread=patch_thread, time=True
     )
diff --git a/tools/BUILD b/tools/BUILD
@@ -1,3 +1,15 @@
+python_requirement(
+    name="graphviz",
+    requirements=["graphviz"],
+    # used by st2-analyze-links.py and visualize_action_chain.py
+)
+
+python_requirement(
+    name="pika",
+    requirements=["pika"],
+    # used by direct_queue_publisher.py
+)
+
 python_sources(
     overrides={
         "config_gen.py": {
diff --git a/tools/st2-analyze-links.py b/tools/st2-analyze-links.py
@@ -152,11 +152,11 @@ def generate_graph(self, rule_links, out_file):
             print(rule_link._source_action_ref)
             if rule_link._source_action_ref not in nodes:
                 nodes.add(rule_link._source_action_ref)
-                dot.add_node(rule_link._source_action_ref)
+                dot.node(rule_link._source_action_ref, rule_link._source_action_ref)
             if rule_link._dest_action_ref not in nodes:
                 nodes.add(rule_link._dest_action_ref)
-                dot.add_node(rule_link._dest_action_ref)
-            dot.add_edge(
+                dot.node(rule_link._dest_action_ref, rule_link._dest_action_ref)
+            dot.edge(
                 rule_link._source_action_ref,
                 rule_link._dest_action_ref,
                 constraint="true",
diff --git a/tools/visualize_action_chain.py b/tools/visualize_action_chain.py
@@ -71,7 +71,7 @@ def main(metadata_path, output_path, print_source=False):
     # Add all nodes
     node = chain_holder.get_next_node()
     while node:
-        dot.add_node(node.name)
+        dot.node(node.name, node.name)
         node = chain_holder.get_next_node(curr_node_name=node.name)
 
     # Add connections
@@ -89,7 +89,7 @@ def main(metadata_path, output_path, print_source=False):
 
         # Add success node (if any)
         if success_node:
-            dot.add_edge(
+            dot.edge(
                 previous_node.name,
                 success_node.name,
                 constraint="true",
@@ -102,7 +102,7 @@ def main(metadata_path, output_path, print_source=False):
 
         # Add failure node (if any)
         if failure_node:
-            dot.add_edge(
+            dot.edge(
                 previous_node.name,
                 failure_node.name,
                 constraint="true",

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ def monkey_patch(patch_thread=None):`
`56`	`56`	`if patch_thread is None:`
`57`	`57`	`patch_thread = not is_use_debugger_flag_provided()`
`58`	`58`
	`59`	`+ # TODO: support gevent.patch_all if .concurrency.CONCURRENCY_LIBRARY = "gevent"`
`59`	`60`	`eventlet.monkey_patch(`
`60`	`61`	`os=True, select=True, socket=True, thread=patch_thread, time=True`
`61`	`62`	`)`