From 667c839629d74f37fdf185c82c6cf17683a489f3 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Sun, 19 Mar 2017 00:16:38 -0700 Subject: [PATCH] Rename nlx to dvc --- ...d-instance-create => dvc-cloud-instance-create} | 0 ...d-instance-delete => dvc-cloud-instance-delete} | 0 ...stance-describe => dvc-cloud-instance-describe} | 0 bin/{nlx-cloud-run => dvc-cloud-run} | 0 bin/dvc-data-import | 3 +++ bin/dvc-data-remove | 3 +++ bin/dvc-data-sync | 3 +++ bin/dvc-init | 4 ++++ bin/dvc-repro | 4 ++++ bin/dvc-run | 3 +++ bin/nlx-data-import | 3 --- bin/nlx-data-remove | 3 --- bin/nlx-data-sync | 3 --- bin/nlx-init | 3 --- bin/nlx-repro | 3 --- bin/nlx-run | 3 --- neatlynx.conf => dvc.conf | 6 +++--- {neatlynx => dvc}/__init__.py | 0 {neatlynx => dvc}/cmd_base.py | 8 ++++---- {neatlynx => dvc}/cmd_data_import.py | 12 ++++++------ {neatlynx => dvc}/cmd_data_remove.py | 8 ++++---- {neatlynx => dvc}/cmd_data_sync.py | 8 ++++---- {neatlynx => dvc}/cmd_init.py | 14 +++++++------- {neatlynx => dvc}/cmd_repro.py | 14 +++++++------- {neatlynx => dvc}/cmd_run.py | 14 +++++++------- {neatlynx => dvc}/config.py | 4 ++-- {neatlynx => dvc}/data_file_obj.py | 2 +- {neatlynx => dvc}/dvc_path.py | 0 {neatlynx => dvc}/exceptions.py | 0 {neatlynx => dvc}/git_wrapper.py | 8 ++++---- {neatlynx => dvc}/logger.py | 0 {neatlynx => dvc}/repository_change.py | 6 +++--- {neatlynx => dvc}/state_file.py | 6 +++--- tests/test_data_file_obj.py | 6 +++--- tests/test_dvc_path.py | 2 +- unittests.sh | 2 +- 36 files changed, 80 insertions(+), 78 deletions(-) rename bin/{nlx-cloud-instance-create => dvc-cloud-instance-create} (100%) rename bin/{nlx-cloud-instance-delete => dvc-cloud-instance-delete} (100%) rename bin/{nlx-cloud-instance-describe => dvc-cloud-instance-describe} (100%) rename bin/{nlx-cloud-run => dvc-cloud-run} (100%) create mode 100755 bin/dvc-data-import create mode 100755 bin/dvc-data-remove create mode 100755 bin/dvc-data-sync create mode 100755 bin/dvc-init create mode 100755 bin/dvc-repro create mode 100755 bin/dvc-run delete mode 100755 bin/nlx-data-import delete mode 100755 bin/nlx-data-remove delete mode 100755 bin/nlx-data-sync delete mode 100755 bin/nlx-init delete mode 100755 bin/nlx-repro delete mode 100755 bin/nlx-run rename neatlynx.conf => dvc.conf (76%) rename {neatlynx => dvc}/__init__.py (100%) rename {neatlynx => dvc}/cmd_base.py (94%) rename {neatlynx => dvc}/cmd_data_import.py (95%) rename {neatlynx => dvc}/cmd_data_remove.py (95%) rename {neatlynx => dvc}/cmd_data_sync.py (95%) rename {neatlynx => dvc}/cmd_init.py (93%) rename {neatlynx => dvc}/cmd_repro.py (95%) rename {neatlynx => dvc}/cmd_run.py (95%) rename {neatlynx => dvc}/config.py (96%) rename {neatlynx => dvc}/data_file_obj.py (98%) rename {neatlynx => dvc}/dvc_path.py (100%) rename {neatlynx => dvc}/exceptions.py (100%) rename {neatlynx => dvc}/git_wrapper.py (97%) rename {neatlynx => dvc}/logger.py (100%) rename {neatlynx => dvc}/repository_change.py (95%) rename {neatlynx => dvc}/state_file.py (96%) diff --git a/bin/nlx-cloud-instance-create b/bin/dvc-cloud-instance-create similarity index 100% rename from bin/nlx-cloud-instance-create rename to bin/dvc-cloud-instance-create diff --git a/bin/nlx-cloud-instance-delete b/bin/dvc-cloud-instance-delete similarity index 100% rename from bin/nlx-cloud-instance-delete rename to bin/dvc-cloud-instance-delete diff --git a/bin/nlx-cloud-instance-describe b/bin/dvc-cloud-instance-describe similarity index 100% rename from bin/nlx-cloud-instance-describe rename to bin/dvc-cloud-instance-describe diff --git a/bin/nlx-cloud-run b/bin/dvc-cloud-run similarity index 100% rename from bin/nlx-cloud-run rename to bin/dvc-cloud-run diff --git a/bin/dvc-data-import b/bin/dvc-data-import new file mode 100755 index 000000000..7d9cd8773 --- /dev/null +++ b/bin/dvc-data-import @@ -0,0 +1,3 @@ +#!/bin/bash + +PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_import.py $@ diff --git a/bin/dvc-data-remove b/bin/dvc-data-remove new file mode 100755 index 000000000..56fe9273e --- /dev/null +++ b/bin/dvc-data-remove @@ -0,0 +1,3 @@ +#!/bin/bash + +PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_remove.py $@ diff --git a/bin/dvc-data-sync b/bin/dvc-data-sync new file mode 100755 index 000000000..1cc1a57c7 --- /dev/null +++ b/bin/dvc-data-sync @@ -0,0 +1,3 @@ +#!/bin/bash + +PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_sync.py $@ diff --git a/bin/dvc-init b/bin/dvc-init new file mode 100755 index 000000000..c45a2f54d --- /dev/null +++ b/bin/dvc-init @@ -0,0 +1,4 @@ +#!/bin/bash + +PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_init.py $@ + diff --git a/bin/dvc-repro b/bin/dvc-repro new file mode 100755 index 000000000..3c18b5d25 --- /dev/null +++ b/bin/dvc-repro @@ -0,0 +1,4 @@ +#!/bin/bash + +PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_repro.py $@ + diff --git a/bin/dvc-run b/bin/dvc-run new file mode 100755 index 000000000..6001a5fb2 --- /dev/null +++ b/bin/dvc-run @@ -0,0 +1,3 @@ +#!/bin/bash + +PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_run.py $@ diff --git a/bin/nlx-data-import b/bin/nlx-data-import deleted file mode 100755 index e5706e8fe..000000000 --- a/bin/nlx-data-import +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$NEATLYNX_HOME python $NEATLYNX_HOME/neatlynx/cmd_data_import.py $@ diff --git a/bin/nlx-data-remove b/bin/nlx-data-remove deleted file mode 100755 index 3a758a151..000000000 --- a/bin/nlx-data-remove +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$NEATLYNX_HOME python $NEATLYNX_HOME/neatlynx/cmd_data_remove.py $@ diff --git a/bin/nlx-data-sync b/bin/nlx-data-sync deleted file mode 100755 index 9c60357fa..000000000 --- a/bin/nlx-data-sync +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$NEATLYNX_HOME python $NEATLYNX_HOME/neatlynx/cmd_data_sync.py $@ diff --git a/bin/nlx-init b/bin/nlx-init deleted file mode 100755 index 523e28730..000000000 --- a/bin/nlx-init +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$NEATLYNX_HOME python $NEATLYNX_HOME/neatlynx/cmd_init.py $@ diff --git a/bin/nlx-repro b/bin/nlx-repro deleted file mode 100755 index 65bf54f04..000000000 --- a/bin/nlx-repro +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$NEATLYNX_HOME python $NEATLYNX_HOME/neatlynx/cmd_repro.py $@ diff --git a/bin/nlx-run b/bin/nlx-run deleted file mode 100755 index 2ccdb83c6..000000000 --- a/bin/nlx-run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -PYTHONPATH=$NEATLYNX_HOME python $NEATLYNX_HOME/neatlynx/cmd_run.py $@ diff --git a/neatlynx.conf b/dvc.conf similarity index 76% rename from neatlynx.conf rename to dvc.conf index 817ad6645..e08abfe73 100644 --- a/neatlynx.conf +++ b/dvc.conf @@ -8,7 +8,7 @@ Cloud = AWS AccessKeyId = SecretAccessKey = -StoragePath = neatlynx/tutorial +StoragePath = dvc/tutorial Region = us-east-1 @@ -24,6 +24,6 @@ SpotTimeout = 300 Storage = my-100gb-drive-io KeyDir = ~/.ssh -KeyName = neatlynx-key +KeyName = dvc-key -SecurityGroup = neatlynx-group +SecurityGroup = dvc-group diff --git a/neatlynx/__init__.py b/dvc/__init__.py similarity index 100% rename from neatlynx/__init__.py rename to dvc/__init__.py diff --git a/neatlynx/cmd_base.py b/dvc/cmd_base.py similarity index 94% rename from neatlynx/cmd_base.py rename to dvc/cmd_base.py index 4469d21b2..e3cd23dcf 100644 --- a/neatlynx/cmd_base.py +++ b/dvc/cmd_base.py @@ -1,13 +1,13 @@ import argparse import os -from neatlynx.git_wrapper import GitWrapper -from neatlynx.config import Config, ConfigError -from neatlynx.logger import Logger +from dvc.git_wrapper import GitWrapper +from dvc.config import Config, ConfigError +from dvc.logger import Logger class CmdBase(object): - CONFIG = 'neatlynx.conf' + CONFIG = 'dvc.conf' def __init__(self, parse_config=True): self._git = GitWrapper() diff --git a/neatlynx/cmd_data_import.py b/dvc/cmd_data_import.py similarity index 95% rename from neatlynx/cmd_data_import.py rename to dvc/cmd_data_import.py index 3d7ee30fc..3e4d76555 100644 --- a/neatlynx/cmd_data_import.py +++ b/dvc/cmd_data_import.py @@ -5,12 +5,12 @@ import re import fasteners import requests -from neatlynx.cmd_base import CmdBase -from neatlynx.cmd_data_sync import sizeof_fmt -from neatlynx.logger import Logger -from neatlynx.data_file_obj import DataFileObj -from neatlynx.exceptions import NeatLynxException -from neatlynx.state_file import StateFile +from dvc.cmd_base import CmdBase +from dvc.cmd_data_sync import sizeof_fmt +from dvc.logger import Logger +from dvc.data_file_obj import DataFileObj +from dvc.exceptions import NeatLynxException +from dvc.state_file import StateFile class DataImportError(NeatLynxException): diff --git a/neatlynx/cmd_data_remove.py b/dvc/cmd_data_remove.py similarity index 95% rename from neatlynx/cmd_data_remove.py rename to dvc/cmd_data_remove.py index b0eee1af9..8057afe4e 100644 --- a/neatlynx/cmd_data_remove.py +++ b/dvc/cmd_data_remove.py @@ -2,10 +2,10 @@ import os from boto.s3.connection import S3Connection import fasteners -from neatlynx.cmd_base import CmdBase -from neatlynx.logger import Logger -from neatlynx.exceptions import NeatLynxException -from neatlynx.data_file_obj import DataFileObjExisting +from dvc.cmd_base import CmdBase +from dvc.logger import Logger +from dvc.exceptions import NeatLynxException +from dvc.data_file_obj import DataFileObjExisting class DataRemoveError(NeatLynxException): diff --git a/neatlynx/cmd_data_sync.py b/dvc/cmd_data_sync.py similarity index 95% rename from neatlynx/cmd_data_sync.py rename to dvc/cmd_data_sync.py index 06611a068..a70cfd936 100644 --- a/neatlynx/cmd_data_sync.py +++ b/dvc/cmd_data_sync.py @@ -3,10 +3,10 @@ import os from boto.s3.connection import S3Connection -from neatlynx.cmd_base import CmdBase -from neatlynx.logger import Logger -from neatlynx.data_file_obj import DataFileObjExisting -from neatlynx.exceptions import NeatLynxException +from dvc.cmd_base import CmdBase +from dvc.logger import Logger +from dvc.data_file_obj import DataFileObjExisting +from dvc.exceptions import NeatLynxException class DataSyncError(NeatLynxException): diff --git a/neatlynx/cmd_init.py b/dvc/cmd_init.py similarity index 93% rename from neatlynx/cmd_init.py rename to dvc/cmd_init.py index 5e62530bc..9816cb028 100644 --- a/neatlynx/cmd_init.py +++ b/dvc/cmd_init.py @@ -2,10 +2,10 @@ import os import sys from pathlib import Path -from neatlynx.cmd_base import CmdBase -from neatlynx.logger import Logger -from neatlynx.config import Config -from neatlynx.exceptions import NeatLynxException +from dvc.cmd_base import CmdBase +from dvc.logger import Logger +from dvc.config import Config +from dvc.exceptions import NeatLynxException class InitError(NeatLynxException): @@ -24,7 +24,7 @@ Cloud = AWS AccessKeyId = SecretAccessKey = -StoragePath = neatlynx/tutorial +StoragePath = dvc/tutorial Region = us-east-1 @@ -40,9 +40,9 @@ SpotTimeout = 300 Storage = my-100gb-drive-io KeyDir = ~/.ssh -KeyName = neatlynx-key +KeyName = dvc-key -SecurityGroup = neatlynx-group''' +SecurityGroup = dvc-group''' def __init__(self): CmdBase.__init__(self, parse_config=False) diff --git a/neatlynx/cmd_repro.py b/dvc/cmd_repro.py similarity index 95% rename from neatlynx/cmd_repro.py rename to dvc/cmd_repro.py index b53497959..5d504bab1 100644 --- a/neatlynx/cmd_repro.py +++ b/dvc/cmd_repro.py @@ -2,13 +2,13 @@ import os import fasteners -from neatlynx.cmd_base import CmdBase -from neatlynx.cmd_run import CmdRun -from neatlynx.git_wrapper import GitWrapper -from neatlynx.logger import Logger -from neatlynx.exceptions import NeatLynxException -from neatlynx.data_file_obj import DataFileObj, NotInDataDirError -from neatlynx.state_file import StateFile +from dvc.cmd_base import CmdBase +from dvc.cmd_run import CmdRun +from dvc.git_wrapper import GitWrapper +from dvc.logger import Logger +from dvc.exceptions import NeatLynxException +from dvc.data_file_obj import DataFileObj, NotInDataDirError +from dvc.state_file import StateFile class ReproError(NeatLynxException): diff --git a/neatlynx/cmd_run.py b/dvc/cmd_run.py similarity index 95% rename from neatlynx/cmd_run.py rename to dvc/cmd_run.py index f4d812f48..cf26beabd 100644 --- a/neatlynx/cmd_run.py +++ b/dvc/cmd_run.py @@ -2,13 +2,13 @@ import os import shutil import fasteners -from neatlynx.data_file_obj import DataFileObj, NotInDataDirError -from neatlynx.git_wrapper import GitWrapper -from neatlynx.cmd_base import CmdBase -from neatlynx.logger import Logger -from neatlynx.exceptions import NeatLynxException -from neatlynx.repository_change import RepositoryChange -from neatlynx.state_file import StateFile +from dvc.data_file_obj import DataFileObj, NotInDataDirError +from dvc.git_wrapper import GitWrapper +from dvc.cmd_base import CmdBase +from dvc.logger import Logger +from dvc.exceptions import NeatLynxException +from dvc.repository_change import RepositoryChange +from dvc.state_file import StateFile class RunError(NeatLynxException): diff --git a/neatlynx/config.py b/dvc/config.py similarity index 96% rename from neatlynx/config.py rename to dvc/config.py index d34313414..26703bfc6 100644 --- a/neatlynx/config.py +++ b/dvc/config.py @@ -1,7 +1,7 @@ import os import configparser -from neatlynx.exceptions import NeatLynxException +from dvc.exceptions import NeatLynxException class ConfigError(NeatLynxException): @@ -30,7 +30,7 @@ class ConfigI(object): class Config(ConfigI): - CONFIG = 'neatlynx.conf' + CONFIG = 'dvc.conf' def __init__(self, conf_file): self._conf_file = conf_file diff --git a/neatlynx/data_file_obj.py b/dvc/data_file_obj.py similarity index 98% rename from neatlynx/data_file_obj.py rename to dvc/data_file_obj.py index 69f87f2d0..f0df6b256 100644 --- a/neatlynx/data_file_obj.py +++ b/dvc/data_file_obj.py @@ -1,6 +1,6 @@ import os -from neatlynx.exceptions import NeatLynxException +from dvc.exceptions import NeatLynxException class DataFilePathError(NeatLynxException): diff --git a/neatlynx/dvc_path.py b/dvc/dvc_path.py similarity index 100% rename from neatlynx/dvc_path.py rename to dvc/dvc_path.py diff --git a/neatlynx/exceptions.py b/dvc/exceptions.py similarity index 100% rename from neatlynx/exceptions.py rename to dvc/exceptions.py diff --git a/neatlynx/git_wrapper.py b/dvc/git_wrapper.py similarity index 97% rename from neatlynx/git_wrapper.py rename to dvc/git_wrapper.py index a1f7c013b..d32c7c812 100644 --- a/neatlynx/git_wrapper.py +++ b/dvc/git_wrapper.py @@ -2,10 +2,10 @@ import os import sys import subprocess -from neatlynx.dvc_path import DvcPath -from neatlynx.exceptions import NeatLynxException -from neatlynx.logger import Logger -from neatlynx.config import Config +from dvc.dvc_path import DvcPath +from dvc.exceptions import NeatLynxException +from dvc.logger import Logger +from dvc.config import Config class GitCmdError(NeatLynxException): diff --git a/neatlynx/logger.py b/dvc/logger.py similarity index 100% rename from neatlynx/logger.py rename to dvc/logger.py diff --git a/neatlynx/repository_change.py b/dvc/repository_change.py similarity index 95% rename from neatlynx/repository_change.py rename to dvc/repository_change.py index 0f3a2780b..1c3c5603b 100644 --- a/neatlynx/repository_change.py +++ b/dvc/repository_change.py @@ -1,8 +1,8 @@ import os -from neatlynx.data_file_obj import DataFileObj, NotInDataDirError -from neatlynx.exceptions import NeatLynxException -from neatlynx.git_wrapper import GitWrapper +from dvc.data_file_obj import DataFileObj, NotInDataDirError +from dvc.exceptions import NeatLynxException +from dvc.git_wrapper import GitWrapper class RepositoryChangeError(NeatLynxException): diff --git a/neatlynx/state_file.py b/dvc/state_file.py similarity index 96% rename from neatlynx/state_file.py rename to dvc/state_file.py index 028ab25ad..eda21783f 100644 --- a/neatlynx/state_file.py +++ b/dvc/state_file.py @@ -3,9 +3,9 @@ import sys import json import time -from neatlynx.exceptions import NeatLynxException -from neatlynx.git_wrapper import GitWrapper -from neatlynx.logger import Logger +from dvc.exceptions import NeatLynxException +from dvc.git_wrapper import GitWrapper +from dvc.logger import Logger class StateFileError(NeatLynxException): diff --git a/tests/test_data_file_obj.py b/tests/test_data_file_obj.py index 71ecd481b..f4be881f2 100644 --- a/tests/test_data_file_obj.py +++ b/tests/test_data_file_obj.py @@ -2,9 +2,9 @@ from unittest import TestCase import os import shutil -from neatlynx.config import ConfigI -from neatlynx.data_file_obj import DataFileObj, NotInDataDirError, DataFilePathError -from neatlynx.git_wrapper import GitWrapperI +from dvc.config import ConfigI +from dvc.data_file_obj import DataFileObj, NotInDataDirError, DataFilePathError +from dvc.git_wrapper import GitWrapperI class BasicDataDirTest(TestCase): diff --git a/tests/test_dvc_path.py b/tests/test_dvc_path.py index 203f6529b..83cc8269d 100644 --- a/tests/test_dvc_path.py +++ b/tests/test_dvc_path.py @@ -2,7 +2,7 @@ import os import shutil from unittest import TestCase -from neatlynx.git_wrapper import GitWrapperI +from dvc.git_wrapper import GitWrapperI class TestDvcPathTest(TestCase): diff --git a/unittests.sh b/unittests.sh index d48d0fcc6..bf2878403 100755 --- a/unittests.sh +++ b/unittests.sh @@ -1,2 +1,2 @@ -nosetests --cover-inclusive --cover-erase --cover-package=neatlynx --with-coverage +nosetests --cover-inclusive --cover-erase --cover-package=dvc --with-coverage CODECLIMATE_REPO_TOKEN=a668a3d02db00ab993ad82e1b3d5d2eb00c3c2e26e659153ae4cfd2f12aaad23 codeclimate-test-reporter