remove more

sky/backends/backend_utils.py

@@ -742,11 +742,6 @@ def write_cluster_config(
 
     # User-supplied global instance tags from ~/.sky/config.yaml.
     labels = skypilot_config.get_nested((str(cloud).lower(), 'labels'), {})
-    # Deprecated: instance_tags have been replaced by labels. For backward
-    # compatibility, we support them and the schema allows them only if
-    # `labels` are not specified. This should be removed after 0.7.0.
-    labels = skypilot_config.get_nested((str(cloud).lower(), 'instance_tags'),
-                                        labels)
     # labels is a dict, which is guaranteed by the type check in
     # schemas.py
     assert isinstance(labels, dict), labels

sky/skylet/log_lib.py

@@ -186,20 +186,11 @@ def run_with_log(
             daemon_script = os.path.join(
                 os.path.dirname(os.path.abspath(job_lib.__file__)),
                 'subprocess_daemon.py')
-            if not hasattr(constants, 'SKY_GET_PYTHON_PATH_CMD'):
-                # Backward compatibility: for cluster started before #3326, this
-                # constant does not exist. Since we generate the job script
-                # in backends.cloud_vm_ray_backend with inspect, so the
-                # the lates `run_with_log` will be used, but the `constants` is
-                # not updated. We fallback to `python3` in this case.
-                # TODO(zhwu): remove this after 0.7.0.
-                python_path = 'python3'
-            else:
-                python_path = subprocess.check_output(
-                    constants.SKY_GET_PYTHON_PATH_CMD,
-                    shell=True,
-                    stderr=subprocess.DEVNULL,
-                    encoding='utf-8').strip()
+            python_path = subprocess.check_output(
+                constants.SKY_GET_PYTHON_PATH_CMD,
+                shell=True,
+                stderr=subprocess.DEVNULL,
+                encoding='utf-8').strip()
             daemon_cmd = [
                 python_path,
                 daemon_script,

sky/utils/schemas.py

@@ -581,15 +581,6 @@ def get_cluster_schema():
 }
 
 _LABELS_SCHEMA = {
-    # Deprecated: 'instance_tags' is replaced by 'labels'. Keeping for backward
-    # compatibility. Will be removed after 0.7.0.
-    'instance_tags': {
-        'type': 'object',
-        'required': [],
-        'additionalProperties': {
-            'type': 'string',
-        },
-    },
     'labels': {
         'type': 'object',
         'required': [],
@@ -710,7 +701,6 @@ def get_config_schema():
                 **_LABELS_SCHEMA,
                 **_NETWORK_CONFIG_SCHEMA,
             },
-            **_check_not_both_fields_present('instance_tags', 'labels')
         },
         'gcp': {
             'type': 'object',
@@ -748,7 +738,6 @@ def get_config_schema():
                 **_LABELS_SCHEMA,
                 **_NETWORK_CONFIG_SCHEMA,
             },
-            **_check_not_both_fields_present('instance_tags', 'labels')
         },
         'azure': {
             'type': 'object',

tests/test_smoke.py

@@ -2051,7 +2051,7 @@ def test_runpod_http_server_with_custom_ports():
     run_one_test(test)
 
 
-# ---------- Labels from task on AWS (instance_tags) ----------
+# ---------- Labels from task on AWS ----------
 @pytest.mark.aws
 def test_task_labels_aws():
     name = _get_cluster_name()