Merge pull request #336 from gagneurlab/dev

Dev

docs/source/conf.py

@@ -23,7 +23,7 @@
 author = 'Michaela Müller'
 
 # The full version, including alpha/beta/rc tags
-release_ = '1.2.0'
+release_ = '1.2.1'
 
 
 

drop/__init__.py

@@ -4,5 +4,5 @@
 from . import utils
 from . import demo
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 

drop/cli.py

@@ -17,7 +17,7 @@
 
 @click.group()
 @click_log.simple_verbosity_option(logger)
-@click.version_option('1.2.0',prog_name='drop')
+@click.version_option('1.2.1',prog_name='drop')
 
 
 def main():

drop/download_data.sh

@@ -5,7 +5,9 @@ set -e
 resource_url="https://github.com/nickhsmith/drop_demo_data/archive/refs/heads/main.zip"
 tmpdir="$(dirname "$(mktemp)")"
 wget -nc -P $tmpdir $resource_url
-if [ -z "$(ls Data)" ]; then
+
+# if the directory Data does not exist
+if [ ! -d "Data" ]; then
 	unzip "$tmpdir/main.zip" 
 	mv drop_demo_data-main/Data Data
 	rm -rf drop_demo_data-main

drop/template/Snakefile

@@ -73,6 +73,7 @@ rule publish_local:
     shell: "rsync -Ort {config[htmlOutputPath]} {config[webDir]}"
 
 rule prepFasta_fa:
+    priority: 1
     input:
         "{path_to_ref}.fa"
     output:
@@ -85,6 +86,7 @@ rule prepFasta_fa:
         """
 
 rule prepFasta_fasta:
+    priority: 1
     input:
         "{path_to_ref}.fasta"
     output:

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.2.1
 
 commit = True
 

setup.py

@@ -21,7 +21,7 @@
 
 setuptools.setup(
     name="drop",
-    version="1.2.0",
+    version="1.2.1",
 
     author="Vicente A. Yépez, Michaela Müller, Nicholas H. Smith, Daniela Klaproth-Andrade, Luise Schuller, Ines Scheller, Christian Mertes <mertes@in.tum.de>, Julien Gagneur <gagneur@in.tum.de>",
     author_email="yepez@in.tum.de",

tests/conftest.py

@@ -19,7 +19,7 @@ def demo_dir(tmpdir_factory):
     assert "demo project created" in r.stderr
     yield run_dir
     LOGGER.info("\n remove demo directory")
-    #run_dir.remove()
+    run_dir.remove()
 
 
 @pytest.fixture(scope="session", autouse=True)