From c8fcd28eb3211f6dc32df9651e6419420196ac6e Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Sun, 19 Mar 2017 00:25:25 -0700 Subject: [PATCH] nlx to dvc renaming in messages --- dvc/cmd_base.py | 12 ++++++------ dvc/cmd_data_import.py | 4 ++-- dvc/cmd_data_remove.py | 4 ++-- dvc/cmd_init.py | 2 +- dvc/cmd_repro.py | 4 ++-- dvc/cmd_run.py | 4 ++-- dvc/state_file.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dvc/cmd_base.py b/dvc/cmd_base.py index e3cd23dcf..603783caa 100644 --- a/dvc/cmd_base.py +++ b/dvc/cmd_base.py @@ -12,7 +12,7 @@ class CmdBase(object): def __init__(self, parse_config=True): self._git = GitWrapper() self._args = None - self._lnx_home = None + self._dvc_home = None self._config = None if parse_config: @@ -22,12 +22,12 @@ class CmdBase(object): self.define_args(parser) self._args, self._args_unkn = parser.parse_known_args() - self._lnx_home = os.environ.get('NEATLYNX_HOME') + self._dvc_home = os.environ.get('DVC_HOME') if not self.lnx_home: - raise ConfigError('NEATLYNX_HOME environment variable is not defined') - if not os.path.exists(self._lnx_home): - raise ConfigError("NEATLYNX_HOME directory doesn't exists") + raise ConfigError('DVC_HOME environment variable is not defined') + if not os.path.exists(self._dvc_home): + raise ConfigError("DVC_HOME directory doesn't exists") pass @property @@ -36,7 +36,7 @@ class CmdBase(object): @property def lnx_home(self): - return self._lnx_home + return self._dvc_home @property def args(self): diff --git a/dvc/cmd_data_import.py b/dvc/cmd_data_import.py index 3e4d76555..f57c0de23 100644 --- a/dvc/cmd_data_import.py +++ b/dvc/cmd_data_import.py @@ -41,7 +41,7 @@ class CmdDataImport(CmdBase): lock = fasteners.InterProcessLock(self.git.lock_file) gotten = lock.acquire(timeout=5) if not gotten: - Logger.printing('Cannot perform the command since NLX is busy and locked. Please retry the command later.') + Logger.printing('Cannot perform the command since DVC is busy and locked. Please retry the command later.') return 1 try: @@ -56,7 +56,7 @@ class CmdDataImport(CmdBase): self.not_committed_changes_warning() return 0 - message = 'NLX data import: {} {}'.format(' '.join(self.args.input), self.args.output) + message = 'DVC data import: {} {}'.format(' '.join(self.args.input), self.args.output) self.git.commit_all_changes_and_log_status(message) finally: lock.release() diff --git a/dvc/cmd_data_remove.py b/dvc/cmd_data_remove.py index 8057afe4e..a9b3009ea 100644 --- a/dvc/cmd_data_remove.py +++ b/dvc/cmd_data_remove.py @@ -30,7 +30,7 @@ class CmdDataRemove(CmdBase): lock = fasteners.InterProcessLock(self.git.lock_file) gotten = lock.acquire(timeout=5) if not gotten: - Logger.printing('Cannot perform the command since NLX is busy and locked. Please retry the command later.') + Logger.printing('Cannot perform the command since DVC is busy and locked. Please retry the command later.') return 1 try: @@ -44,7 +44,7 @@ class CmdDataRemove(CmdBase): self.not_committed_changes_warning() return 0 - message = 'NLX data remove: {}'.format(' '.join(self.args.target)) + message = 'DVC data remove: {}'.format(' '.join(self.args.target)) self.git.commit_all_changes_and_log_status(message) finally: lock.release() diff --git a/dvc/cmd_init.py b/dvc/cmd_init.py index 9816cb028..864eccd4d 100644 --- a/dvc/cmd_init.py +++ b/dvc/cmd_init.py @@ -95,7 +95,7 @@ SecurityGroup = dvc-group''' self.not_committed_changes_warning() return 0 - message = 'NLX init. data dir {}, cache dir {}, state dir {}'.format( + message = 'DVC init. data dir {}, cache dir {}, state dir {}'.format( data_dir_path.name, cache_dir_path.name, state_dir_path.name diff --git a/dvc/cmd_repro.py b/dvc/cmd_repro.py index 5d504bab1..acda7723e 100644 --- a/dvc/cmd_repro.py +++ b/dvc/cmd_repro.py @@ -48,7 +48,7 @@ class CmdRepro(CmdRun): lock = fasteners.InterProcessLock(self.git.lock_file) gotten = lock.acquire(timeout=5) if not gotten: - Logger.printing('Cannot perform the command since NLX is busy and locked. Please retry the command later.') + Logger.printing('Cannot perform the command since DVC is busy and locked. Please retry the command later.') return 1 try: @@ -92,7 +92,7 @@ class CmdRepro(CmdRun): self.not_committed_changes_warning() return 1 - message = 'NLX repro: {}'.format(' '.join(self.args.target)) + message = 'DVC repro: {}'.format(' '.join(self.args.target)) self.git.commit_all_changes_and_log_status(message) finally: lock.release() diff --git a/dvc/cmd_run.py b/dvc/cmd_run.py index cf26beabd..e88b0cd5d 100644 --- a/dvc/cmd_run.py +++ b/dvc/cmd_run.py @@ -55,7 +55,7 @@ class CmdRun(CmdBase): lock = fasteners.InterProcessLock(self.git.lock_file) gotten = lock.acquire(timeout=5) if not gotten: - Logger.printing('Cannot perform the command since NLX is busy and locked. Please retry the command later.') + Logger.printing('Cannot perform the command since DVC is busy and locked. Please retry the command later.') return 1 try: @@ -69,7 +69,7 @@ class CmdRun(CmdBase): self.not_committed_changes_warning() return 0 - message = 'NLX run: {}'.format(' '.join(sys.argv)) + message = 'DVC run: {}'.format(' '.join(sys.argv)) self.git.commit_all_changes_and_log_status(message) finally: lock.release() diff --git a/dvc/state_file.py b/dvc/state_file.py index eda21783f..4e5677b83 100644 --- a/dvc/state_file.py +++ b/dvc/state_file.py @@ -14,7 +14,7 @@ class StateFileError(NeatLynxException): class StateFile(object): - MAGIC = 'NLX-State' + MAGIC = 'DVC-State' VERSION = '0.1' PARAM_TYPE = 'Type'