Skip to content

Commit

Permalink
Rename nlx to dvc
Browse files Browse the repository at this point in the history
  • Loading branch information
dmpetrov committed Mar 19, 2017
1 parent 306ac69 commit 667c839
Show file tree
Hide file tree
Showing 36 changed files with 80 additions and 78 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions bin/dvc-data-import
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_import.py $@
3 changes: 3 additions & 0 deletions bin/dvc-data-remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_remove.py $@
3 changes: 3 additions & 0 deletions bin/dvc-data-sync
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_data_sync.py $@
4 changes: 4 additions & 0 deletions bin/dvc-init
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_init.py $@

4 changes: 4 additions & 0 deletions bin/dvc-repro
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_repro.py $@

3 changes: 3 additions & 0 deletions bin/dvc-run
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

PYTHONPATH=$DVC_HOME python $DVC_HOME/dvc/cmd_run.py $@
3 changes: 0 additions & 3 deletions bin/nlx-data-import

This file was deleted.

3 changes: 0 additions & 3 deletions bin/nlx-data-remove

This file was deleted.

3 changes: 0 additions & 3 deletions bin/nlx-data-sync

This file was deleted.

3 changes: 0 additions & 3 deletions bin/nlx-init

This file was deleted.

3 changes: 0 additions & 3 deletions bin/nlx-repro

This file was deleted.

3 changes: 0 additions & 3 deletions bin/nlx-run

This file was deleted.

6 changes: 3 additions & 3 deletions neatlynx.conf → dvc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Cloud = AWS
AccessKeyId =
SecretAccessKey =

StoragePath = neatlynx/tutorial
StoragePath = dvc/tutorial


Region = us-east-1
Expand All @@ -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
File renamed without changes.
8 changes: 4 additions & 4 deletions neatlynx/cmd_base.py → dvc/cmd_base.py
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
12 changes: 6 additions & 6 deletions neatlynx/cmd_data_import.py → dvc/cmd_data_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
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):
Expand Down
8 changes: 4 additions & 4 deletions neatlynx/cmd_data_remove.py → dvc/cmd_data_remove.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
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):
Expand Down
8 changes: 4 additions & 4 deletions neatlynx/cmd_data_sync.py → dvc/cmd_data_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

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):
Expand Down
14 changes: 7 additions & 7 deletions neatlynx/cmd_init.py → dvc/cmd_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
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):
Expand All @@ -24,7 +24,7 @@ class CmdInit(CmdBase):
AccessKeyId =
SecretAccessKey =
StoragePath = neatlynx/tutorial
StoragePath = dvc/tutorial
Region = us-east-1
Expand All @@ -40,9 +40,9 @@ class CmdInit(CmdBase):
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)
Expand Down
14 changes: 7 additions & 7 deletions neatlynx/cmd_repro.py → dvc/cmd_repro.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

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):
Expand Down
14 changes: 7 additions & 7 deletions neatlynx/cmd_run.py → dvc/cmd_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
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):
Expand Down
4 changes: 2 additions & 2 deletions neatlynx/config.py → dvc/config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import configparser

from neatlynx.exceptions import NeatLynxException
from dvc.exceptions import NeatLynxException


class ConfigError(NeatLynxException):
Expand Down Expand Up @@ -30,7 +30,7 @@ def state_dir(self):


class Config(ConfigI):
CONFIG = 'neatlynx.conf'
CONFIG = 'dvc.conf'

def __init__(self, conf_file):
self._conf_file = conf_file
Expand Down
2 changes: 1 addition & 1 deletion neatlynx/data_file_obj.py → dvc/data_file_obj.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

from neatlynx.exceptions import NeatLynxException
from dvc.exceptions import NeatLynxException


class DataFilePathError(NeatLynxException):
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions neatlynx/git_wrapper.py → dvc/git_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
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):
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions neatlynx/repository_change.py → dvc/repository_change.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
6 changes: 3 additions & 3 deletions neatlynx/state_file.py → dvc/state_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
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):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_data_file_obj.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
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):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_dvc_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import shutil
from unittest import TestCase

from neatlynx.git_wrapper import GitWrapperI
from dvc.git_wrapper import GitWrapperI


class TestDvcPathTest(TestCase):
Expand Down
2 changes: 1 addition & 1 deletion unittests.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 667c839

Please sign in to comment.