diff --git a/bits b/bits index fbb8d5dd..6690dd50 100755 --- a/bits +++ b/bits @@ -223,6 +223,9 @@ do $BITSDIR/bitsBuild $@ exit $? ;; + setenv) + break + ;; *) shift ;; @@ -277,7 +280,7 @@ do --help|help) printHelp; exit 0 ;; -c) - i+=1; COMMAND_IN_ENV=("$@"); + i=$((i+1)); COMMAND_IN_ENV=("${ARGV[@]:${i}}"); break ;; *) ARGS+=(${ARGV[$i]});; diff --git a/tests/test_deps.py b/tests/test_deps.py index ec5d77e5..4a272607 100644 --- a/tests/test_deps.py +++ b/tests/test_deps.py @@ -66,13 +66,9 @@ def depsOpen(fn, mode): outgraph="/tmp/outgraph.pdf", package="AliRoot", defaults="release", - environment=[]) - def fake_exists(n): - return {"/alidist/aliroot.sh": True} - with patch.object(os.path, "exists", fake_exists): - doDeps(args, MagicMock()) - xdefaults=None) - + environment=[], + xdefaults=None, + ) def fake_exists(n): return True if n in RECIPES else False diff --git a/tests/test_doctor.py b/tests/test_doctor.py index ea5aa74f..181285f2 100644 --- a/tests/test_doctor.py +++ b/tests/test_doctor.py @@ -91,8 +91,9 @@ def resetOut(): architecture="osx_x86-64", disable=[], defaults="release", - environment=[]) - xdefaults=None) + environment=[], + xdefaults=None, + ) # What to call (longer names deprecated in Python 3.5+) if not hasattr(self, "assertRegex"): diff --git a/tests/test_init.py b/tests/test_init.py index 0522188f..341b7861 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -49,7 +49,7 @@ def test_doDryRunInit(self, mock_os, mock_path, mock_info) -> None: fetchRepos = False, architecture = "slc7_x86-64", environment = {}, - xdefaults = None + xdefaults = None, ) self.assertRaises(SystemExit, doInit, args) self.assertEqual(mock_info.mock_calls, [call('This will initialise local checkouts for %s\n--dry-run / -n specified. Doing nothing.', 'zlib,AliRoot')]) @@ -90,7 +90,7 @@ def test_doRealInit(self, mock_read_defaults, mock_open, mock_update_reference, fetchRepos = False, architecture = "slc7_x86-64", environment = {}, - xdefaults = None + xdefaults = None, ) doInit(args) self.assertEqual(mock_git.mock_calls, CLONE_EVERYTHING) diff --git a/tox.ini b/tox.ini index fbeef159..e2cdc813 100644 --- a/tox.ini +++ b/tox.ini @@ -21,6 +21,8 @@ python = ; allowlist_externals = ; find ; deps = +; bison +; flex ; flake8 ; pylint ; changedir = {toxinidir}