🔧 change default dirs

papaemmelab · Oct 16, 2018 · c26bd9e · c26bd9e
1 parent e372fb1
commit c26bd9e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/register_toil/VERSION b/register_toil/VERSION
@@ -1 +1 @@
-1.1.2
+1.1.3
diff --git a/register_toil/cli.py b/register_toil/cli.py
@@ -25,6 +25,8 @@
 from register_toil import __version__
 from register_toil import utils
 
+_DEFAULT_OPTDIR = "/work/isabl/local"
+_DEFAULT_BINDIR = "/work/isabl/bin"
 _DEFAULT_VOLUMES = (
  ("/ifs", "/ifs"),
  ("/juno", "/juno"),
@@ -50,14 +52,14 @@
  show_default=True,
  type=click.Path(resolve_path=True, dir_okay=True),
  help="path were executables will be linked to",
- default=os.getenv("TOIL_REGISTER_BIN", "/work/isabl/local/bin"),
+ default=os.getenv("TOIL_REGISTER_BIN", _DEFAULT_BINDIR),
 )
 @click.option(
  "--optdir",
  show_default=True,
  type=click.Path(resolve_path=True, dir_okay=True),
  help="path were images will be versioned and cached",
- default=os.getenv("TOIL_REGISTER_OPT", "/work/isabl/local/opt"),
+ default=os.getenv("TOIL_REGISTER_OPT", _DEFAULT_OPTDIR),
 )
 @click.option(
  "--python",
@@ -189,14 +191,14 @@ def register_toil(
  show_default=True,
  type=click.Path(resolve_path=True, dir_okay=True),
  help="path were executables will be linked to",
- default=os.getenv("TOIL_REGISTER_BIN", "/work/isabl/local/bin"),
+ default=os.getenv("TOIL_REGISTER_BIN", _DEFAULT_BINDIR),
 )
 @click.option(
  "--optdir",
  show_default=True,
  type=click.Path(resolve_path=True, dir_okay=True),
  help="path were images will be versioned and cached",
- default=os.getenv("TOIL_REGISTER_OPT", "/work/isabl/local/opt"),
+ default=os.getenv("TOIL_REGISTER_OPT", _DEFAULT_OPTDIR),
 )
 @click.option(
  "--tmpvar",

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -9,7 +9,7 @@
 from register_toil import cli
 
 
-def __test_register_toil(tmpdir):
+def test_register_toil(tmpdir):
  """Sample test for register_toil command."""
  runner = CliRunner()
  optdir = tmpdir.mkdir("opt")