cleanup pass

facebookresearch · Dec 13, 2020 · 4d4bd6e · 4d4bd6e
1 parent ec8034d
commit 4d4bd6e
Show file tree

Hide file tree

Showing 81 changed files with 709 additions and 3,513 deletions.
diff --git a/...figsource_plugin/hydra_plugins/example_configsource_plugin/example_configsource_plugin.py b/...figsource_plugin/hydra_plugins/example_configsource_plugin/example_configsource_plugin.py
@@ -86,16 +86,12 @@ def load_config(
             config_path=config_path, cfg=cfg
         )
 
-        defaults_list = self._extract_defaults_list(config_path=config_path, cfg=cfg)
         return ConfigResult(
             config=self._embed_config(cfg, header["package"]),
             path=f"{self.scheme()}://{self.path}",
             provider=self.provider,
             header=header,
-            defaults_list=self._create_defaults_list(
-                config_path=config_path, defaults=raw_defaults_list
-            ),
-            new_defaults_list=self._create_new_defaults_list(raw_defaults_list),
+            defaults_list=self._create_defaults_list(raw_defaults_list),
         )
 
     def available(self) -> bool:

diff --git a/examples/plugins/example_sweeper_plugin/tests/test_example_sweeper_plugin.py b/examples/plugins/example_sweeper_plugin/tests/test_example_sweeper_plugin.py
@@ -81,19 +81,13 @@ class TestExampleSweeperWithBatching(BatchedSweeperTestSuite):
     "task_launcher_cfg, extra_flags",
     [
         (
-            {
-                "defaults": [
-                    {
-                        # CHANGE THIS TO YOUR SWEEPER CONFIG NAME
-                        "hydra/sweeper": "example"
-                    },
-                    {"hydra/launcher": "basic"},
-                    {"hydra/hydra_logging": "hydra_debug"},
-                    {"hydra/job_logging": "disabled"},
-                ],
-                "hydra": {},
-            },
-            ["-m"],
+            {},
+            [
+                "-m",
+                # CHANGE THIS TO YOUR SWEEPER CONFIG NAME
+                "hydra/sweeper=example",
+                "hydra/launcher=basic",
+            ],
         )
     ],
 )