refactor: make configuration-passing from make_dependency_files() to …

…make_dependency_file() stricter
rapidsai · Jan 2, 2024 · 42b5e10 · 42b5e10
1 parent 36a4061
commit 42b5e10
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/src/rapids_dependency_file_generator/rapids_dependency_file_generator.py b/src/rapids_dependency_file_generator/rapids_dependency_file_generator.py
@@ -93,7 +93,7 @@ def grid(gridspec):
 
 
 def make_dependency_file(
-    file_type, name, config_file, output_dir, conda_channels, dependencies, extras=None
+    *, file_type, name, config_file, output_dir, conda_channels, dependencies, extras
 ):
     """Generate the contents of the dependency file.
 
@@ -440,13 +440,13 @@ def make_dependency_files(parsed_config, config_file_path, to_stdout):
                     else get_output_dir(file_type, config_file_path, file_config)
                 )
                 contents = make_dependency_file(
-                    file_type,
-                    full_file_name,
-                    config_file_path,
-                    output_dir,
-                    channels,
-                    deduped_deps,
-                    extras,
+                    file_type=file_type,
+                    name=full_file_name,
+                    confige_file=config_file_path,
+                    output_dir=output_dir,
+                    conda_channels=channels,
+                    dependencies=deduped_deps,
+                    extras=extras,
                 )
 
                 if to_stdout:

diff --git a/tests/test_rapids_dependency_file_generator.py b/tests/test_rapids_dependency_file_generator.py
@@ -40,12 +40,13 @@ def test_make_dependency_file(mock_relpath):
 # To make changes, edit {relpath} and run `{cli_name}`.
 """
     env = make_dependency_file(
-        "conda",
-        "tmp_env.yaml",
-        "config_file",
-        "output_path",
-        ["rapidsai", "nvidia"],
-        ["dep1", "dep2"],
+        file_type="conda",
+        name="tmp_env.yaml",
+        config_file="config_file",
+        output_dir="output_path",
+        conda_channels=["rapidsai", "nvidia"],
+        dependencies=["dep1", "dep2"],
+        extras=None
     )
     assert env == header + yaml.dump(
         {
@@ -56,12 +57,13 @@ def test_make_dependency_file(mock_relpath):
     )
 
     env = make_dependency_file(
-        "requirements",
-        "tmp_env.txt",
-        "config_file",
-        "output_path",
-        ["rapidsai", "nvidia"],
-        ["dep1", "dep2"],
+        file_type="requirements",
+        name="tmp_env.txt",
+        config_file="config_file",
+        output_dir="output_path",
+        conda_channels=["rapidsai", "nvidia"],
+        dependencies=["dep1", "dep2"],
+        extras=None
     )
     assert env == header + "dep1\ndep2\n"