BUG: misc fixes

beardymcjohnface · Oct 16, 2023 · 67bfc3a · 67bfc3a
1 parent 7f1077c
commit 67bfc3a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/tests/test_snaketool.py b/tests/test_snaketool.py
@@ -46,6 +46,6 @@ def test_snaketool_cli(tmp_dir):
 
 def test_snaketool_commands(tmp_dir):
     """test Snaketool"""
-    exec_command("my_snaketool run --input yeet")
+    exec_command("my_snaketool run --input yeet --no-use-conda ")
     exec_command("my_snaketool config")
     exec_command("my_snaketool citation")
diff --git a/{{cookiecutter.project_slug}}/setup.py b/{{cookiecutter.project_slug}}/setup.py
@@ -52,7 +52,7 @@ def get_data_files():
     data_files=get_data_files(),
     py_modules=["{{cookiecutter.project_slug}}"],
     install_requires=[
-        "snaketool-utils>=0.0.3",
+        "snaketool-utils>=0.0.4",
         "snakemake{{cookiecutter.snakemake_version}}",
         "pyyaml{{cookiecutter.pyyaml_version}}",
         "Click{{cookiecutter.click_version}}",

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__main__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__main__.py
@@ -151,7 +151,7 @@ def run(**kwargs):
     """Run {{cookiecutter.project_name}}"""
     # Config to add or update in configfile
     merge_config = {
-        "{{cookiecutter.project_name}}": {
+        "{{cookiecutter.project_slug}}": {
             "args": kwargs
         }
     }
@@ -167,9 +167,9 @@ def run(**kwargs):
 
 @click.command()
 @common_options
-def config(**kwargs):
+def config(configfile, system_config, **kwargs):
     """Copy the system default config file"""
-    copy_config(kwargs["configfile"])
+    copy_config(configfile, system_config=system_config)
 
 
 @click.command()

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/config/config.yaml b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/config/config.yaml
@@ -1,5 +1,6 @@
 # Namespaced config file example
 {{cookiecutter.project_slug}}:
-    args:
-        # Command line args will overwrite anything here at runtime
-    # Customisable config here
+    args: # Command line args will be (over)written here at runtime
+        input:
+        output:
+    # Add customisable config here
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/workflow/Snakefile b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/workflow/Snakefile
@@ -2,7 +2,6 @@
 # Update default config with runtime config
 configfile: os.path.join(workflow.basedir, "../", "config", "config.yaml")
 configfile: os.path.join(workflow.basedir, "../", "config", "system_config.yaml")
-config.update(config["{{cookiecutter.project_slug}}"]) # convenience if using namespaced config
 
 
 # Rules files