Merge branch 'main' into refactor-experiment-ui

brown-ccv · Nov 13, 2024 · f786816 · f786816
2 parents e13040c + 24ecab5
commit f786816
Show file tree

Hide file tree

Showing 8 changed files with 973 additions and 651 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,9 +1,12 @@
 {
-    "editor.defaultFormatter": "ms-python.black-formatter",
     "editor.formatOnSave": true,
+    "black-formatter.importStrategy": "fromEnvironment",
     "python.testing.pytestArgs": [
         "."
     ],
     "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    }
 }
diff --git a/examples/entering-a-room.json b/examples/entering-a-room.json
@@ -21,61 +21,61 @@
     "behavior_library": [
         {
             "id": "anonymous-sequence",
-            "display_name": "",
+            "name": "",
             "type": "Sequence",
             "show": false
         },
         {
             "id": "approach-door",
-            "display_name": "Approach the door",
+            "name": "Approach the door",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "open-door",
-            "display_name": "Open the door",
+            "name": "Open the door",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "go-through-doorway",
-            "display_name": "Go through the doorway",
+            "name": "Go through the doorway",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "knock-on-the-door",
-            "display_name": "Knock on the door",
+            "name": "Knock on the door",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "sing-a-song",
-            "display_name": "Sing a song",
+            "name": "Sing a song",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "announce-your-presence",
-            "display_name": "Announce your presence",
+            "name": "Announce your presence",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "contact-supervisor-guidance",
-            "display_name": "Contact supervisor for guidance",
+            "name": "Contact supervisor for guidance",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "stop",
-            "display_name": "Stop",
+            "name": "Stop",
             "type": "Behavior",
             "show": true
         },
         {
             "id": "return-to-charging-station",
-            "display_name": "Return to charging station",
+            "name": "Return to charging station",
             "type": "Behavior",
             "show": false
         }

diff --git a/pyproject.toml b/pyproject.toml
@@ -123,7 +123,3 @@ version.source = "vcs"
 
 [tool.pytest.ini_options]
 addopts = "--doctest-modules"
-
-[tool.black]
-target-version = ['py311']
-