nlx to dvc renaming in messages

This commit is contained in:
Dmitry Petrov
2017-03-19 00:25:25 -07:00
parent 667c839629
commit c8fcd28eb3
7 changed files with 16 additions and 16 deletions
+6 -6
View File
@@ -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):
+2 -2
View File
@@ -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()
+2 -2
View File
@@ -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()
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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()
+2 -2
View File
@@ -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()
+1 -1
View File
@@ -14,7 +14,7 @@ class StateFileError(NeatLynxException):
class StateFile(object):
MAGIC = 'NLX-State'
MAGIC = 'DVC-State'
VERSION = '0.1'
PARAM_TYPE = 'Type'