YAPF, take 3 (#2098)

* Use pep8 style

The original style file is actually just pep8 style, but with everything
spelled out. It's easier to use the `based_on_style` feature. Any overrides are
clearer that way.

* Improve yapf script

1. Do formatting in parallel
2. Lint RLlib
3. Use .style.yapf file

* Pull out expressions into variables

* Don't format rllib

* Don't allow splits in dicts

* Apply yapf

* Disallow single line if-statements

* Use arithmetic comparison

* Simplify checking for changed files

* Pull out expr into var

python/ray/autoscaler/autoscaler.py

@@ -182,19 +182,15 @@ class LoadMetrics(object):
             nodes_used += max_frac
         idle_times = [now - t for t in self.last_used_time_by_ip.values()]
         return {
-            "ResourceUsage":
-            ", ".join([
+            "ResourceUsage": ", ".join([
                 "{}/{} {}".format(
                     round(resources_used[rid], 2),
                     round(resources_total[rid], 2), rid)
                 for rid in sorted(resources_used)
             ]),
-            "NumNodesConnected":
-            len(self.static_resources_by_ip),
-            "NumNodesUsed":
-            round(nodes_used, 2),
-            "NodeIdleSeconds":
-            "Min={} Mean={} Max={}".format(
+            "NumNodesConnected": len(self.static_resources_by_ip),
+            "NumNodesUsed": round(nodes_used, 2),
+            "NodeIdleSeconds": "Min={} Mean={} Max={}".format(
                 int(np.min(idle_times)) if idle_times else -1,
                 int(np.mean(idle_times)) if idle_times else -1,
                 int(np.max(idle_times)) if idle_times else -1),

python/ray/autoscaler/aws/config.py

@@ -209,22 +209,21 @@ def _configure_security_group(config):
         assert security_group, "Failed to create security group"
 
     if not security_group.ip_permissions:
-        security_group.authorize_ingress(
-            IpPermissions=[{
-                "FromPort": -1,
-                "ToPort": -1,
-                "IpProtocol": "-1",
-                "UserIdGroupPairs": [{
-                    "GroupId": security_group.id
-                }]
-            }, {
-                "FromPort": 22,
-                "ToPort": 22,
-                "IpProtocol": "TCP",
-                "IpRanges": [{
-                    "CidrIp": "0.0.0.0/0"
-                }]
-            }])
+        security_group.authorize_ingress(IpPermissions=[{
+            "FromPort": -1,
+            "ToPort": -1,
+            "IpProtocol": "-1",
+            "UserIdGroupPairs": [{
+                "GroupId": security_group.id
+            }]
+        }, {
+            "FromPort": 22,
+            "ToPort": 22,
+            "IpProtocol": "TCP",
+            "IpRanges": [{
+                "CidrIp": "0.0.0.0/0"
+            }]
+        }])
 
     if "SecurityGroupIds" not in config["head_node"]:
         print("SecurityGroupIds not specified for head node, using {}".format(

python/ray/autoscaler/aws/node_provider.py

@@ -101,12 +101,9 @@ class AWSNodeProvider(NodeProvider):
                 "Value": v,
             })
         conf.update({
-            "MinCount":
-            1,
-            "MaxCount":
-            count,
-            "TagSpecifications":
-            conf.get("TagSpecifications", []) + [{
+            "MinCount": 1,
+            "MaxCount": count,
+            "TagSpecifications": conf.get("TagSpecifications", []) + [{
                 "ResourceType": "instance",
                 "Tags": tag_pairs,
             }]

python/ray/autoscaler/commands.py

@@ -128,10 +128,8 @@ def get_or_create_head_node(config, no_restart, yes):
     remote_config_file.write(json.dumps(remote_config))
     remote_config_file.flush()
     config["file_mounts"].update({
-        remote_key_path:
-        config["auth"]["ssh_private_key"],
-        "~/ray_bootstrap_config.yaml":
-        remote_config_file.name
+        remote_key_path: config["auth"]["ssh_private_key"],
+        "~/ray_bootstrap_config.yaml": remote_config_file.name
     })
 
     if no_restart: