Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dvc/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def get_parent_parser():
"""Create instances of a parser containing common arguments shared among
all the commands.

When overwritting `-q` or `-v`, you need to instantiate a new object
When overwriting `-q` or `-v`, you need to instantiate a new object
in order to prevent some weird behavior.
"""
parent_parser = argparse.ArgumentParser(add_help=False)
Expand Down
2 changes: 1 addition & 1 deletion dvc/command/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def get_fs_type(path):
for parent in itertools.chain([path], path.parents):
if parent in partition:
return partition[parent]
return ("unkown", "none")
return ("unknown", "none")

@staticmethod
def get_linktype_support_info(repo):
Expand Down
2 changes: 1 addition & 1 deletion dvc/daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def _spawn_windows(cmd, env):

def _spawn_posix(cmd, env):
# NOTE: using os._exit instead of sys.exit, because dvc built
# with PyInstaller has trouble with SystemExit exeption and throws
# with PyInstaller has trouble with SystemExit exception and throws
# errors such as "[26338] Failed to execute script __main__"
try:
pid = os.fork()
Expand Down
4 changes: 2 additions & 2 deletions dvc/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ColorFormatter(logging.Formatter):
__ https://pypi.python.org/pypi/colorama

For records containing `exc_info`, it will use a custom `_walk_exc` to
retrieve the whole tracebak.
retrieve the whole traceback.
"""

color_code = {
Expand Down Expand Up @@ -154,7 +154,7 @@ def handleError(self, record):
raise LoggingException(record)

def emit(self, record):
"""Write to Tqdm's stream so as to not break progressbars"""
"""Write to Tqdm's stream so as to not break progress-bars"""
try:
msg = self.format(record)
Tqdm.write(
Expand Down
2 changes: 1 addition & 1 deletion dvc/path_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def from_posix(cls, s):
def as_posix(self):
f = self._flavour
# Unlike original implementation [1] that uses `str()` we actually need
# to use `fspath`, because we've overriden `__str__` method to return
# to use `fspath`, because we've overridden `__str__` method to return
# relative paths, which will break original `as_posix`.
#
# [1] https://github.com/python/cpython/blob/v3.7.0/Lib/pathlib.py#L692
Expand Down
2 changes: 1 addition & 1 deletion dvc/remote/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def hardlink(self, from_info, to_info):
# will get something like: `too many links error`
#
# This is because all those empty files will have the same checksum
# (i.e. 68b329da9893e34099c7d8ad5cb9c940), therfore, they will be
# (i.e. 68b329da9893e34099c7d8ad5cb9c940), therefore, they will be
# linked to the same file in the cache.
#
# From https://en.wikipedia.org/wiki/Hard_link
Expand Down
2 changes: 1 addition & 1 deletion dvc/repo/brancher.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def brancher( # noqa: E302
str: the display name for the currently selected tree, it could be:
- a git revision identifier
- empty string it there is no branches to iterate over
- "Working Tree" if there are uncommited changes in the SCM repo
- "Working Tree" if there are uncommitted changes in the SCM repo
"""
if not any([branches, all_branches, tags, all_tags, all_commits]):
yield ""
Expand Down
2 changes: 1 addition & 1 deletion dvc/repo/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def _diff_royal(self, target, diff_dct):

@locked
def diff(self, a_ref, target=None, b_ref=None):
"""Gerenates diff message string output
"""Generates diff message string output

Args:
target(str) - file/directory to check diff of
Expand Down
2 changes: 1 addition & 1 deletion dvc/repo/reproduce.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def _reproduce_stages(

The derived evaluation of D would be: [A, B, C, D]

In case that `downstream` option is specifed, the desired effect
In case that `downstream` option is specified, the desired effect
is to derive the evaluation starting from the given stage up to the
ancestors. However, the `networkx.ancestors` returns a set, without
any guarantee of any order, so we are going to reverse the graph and
Expand Down
2 changes: 1 addition & 1 deletion dvc/scm/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def is_tracked(self, path): # pylint: disable=no-self-use, unused-argument
return False

def is_dirty(self):
"""Return whether the SCM contains uncommited changes."""
"""Return whether the SCM contains uncommitted changes."""
return False

def active_branch(self): # pylint: disable=no-self-use
Expand Down
2 changes: 1 addition & 1 deletion dvc/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ def get_state_record_for_inode(self, inode):
self._execute(cmd, (self._to_sqlite(inode),))
results = self._fetchall()
if results:
# uniquness constrain on inode
# uniqueness constrain on inode
assert len(results) == 1
return results[0]
return None
Expand Down
2 changes: 1 addition & 1 deletion dvc/utils/stage.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def parse_stage(text, path):
def parse_stage_for_update(text, path):
"""Parses text into Python structure.

Unlike `parse_stage()` this returns ordereddicts, values have special
Unlike `parse_stage()` this returns ordered dicts, values have special
attributes to store comments and line breaks. This allows us to preserve
all of those upon dump.

Expand Down
2 changes: 1 addition & 1 deletion scripts/build_posix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ install_dependencies()

gem install --no-document fpm

print_info "Uprgading pip..."
print_info "Upgrading pip..."
pip install --upgrade pip

print_info "Installing requirements..."
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
scriptdir="$(dirname $0)"

# NOTE: it is not uncommon for pip to hang on travis for what seems to be
# networking issues. Thus, let's retry a few times to see if it will eventially
# networking issues. Thus, let's retry a few times to see if it will eventually
# work or not.
$scriptdir/retry.sh pip install --upgrade pip setuptools wheel
$scriptdir/retry.sh pip install .[all,tests]
Expand Down
2 changes: 1 addition & 1 deletion scripts/completion/dvc.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ _dvc_commands() {
"unlock:Unlock DVC-file."
"unprotect:Unprotect data file/directory."
"update:Update data artifacts imported from other DVC repositories."
"version:Show DVC version and system/environment informaion."
"version:Show DVC version and system/environment information."
)

_describe 'dvc commands' _commands
Expand Down
2 changes: 1 addition & 1 deletion scripts/innosetup/modpath.iss
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ begin
end;
end;

// Split a string into an array using passed delimeter
// Split a string into an array using passed delimiter
procedure MPExplode(var Dest: TArrayOfString; Text: String; Separator: String);
var
i: Integer;
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# by your package during runtime, you need to **pin** the build version.
#
# This custom class will replace the version.py module with a **static**
# `__version__` that your package can read at runtime, assuring consistancy.
# `__version__` that your package can read at runtime, assuring consistency.
#
# References:
# - https://docs.python.org/3.7/distutils/extending.html
Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_add.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_unicode(self):
self.assertTrue(os.path.isfile(stage.path))


class TestAddUnupportedFile(TestDvc):
class TestAddUnSupportedFile(TestDvc):
def test(self):
with self.assertRaises(DvcException):
self.dvc.add("unsupported://unsupported")
Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def test_pull_non_workspace(git, dvc_repo, erepo):
dvc_repo.scm.commit("imported branch")
dvc_repo.scm.tag("ref-to-branch")

# Ovewrite via import
# Overwrite via import
dvc_repo.imp(erepo.root_dir, src, dst, rev="master")

os.remove(stage.outs[0].cache_path)
Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_should_post_checkout_hook_checkout(self, repo_dir, git, dvc_repo):
dvc_repo.scm.commit("add")

os.unlink(repo_dir.FOO)
dvc_repo.scm.checkout("new_branc", create_new=True)
dvc_repo.scm.checkout("new_branch", create_new=True)

assert os.path.isfile(repo_dir.FOO)

Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_repro.py
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def test(self):
file1 = "file1"
file1_stage = file1 + ".dvc"
# NOTE: purposefully not specifying dependencies
# to create a callbacs stage.
# to create a callback stage.
stage = self.dvc.run(
fname=file1_stage,
outs=[file1],
Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

@pytest.mark.skipif(os.name != "nt", reason="Windows specific")
def test_getdirinfo(tmp_path):
# simulate someone holding an exclussive access
# simulate someone holding an exclusive access
locked = str(tmp_path / "locked")
fd = os.open(locked, os.O_WRONLY | os.O_CREAT | os.O_EXCL)
try:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/output/test_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_return_0_on_no_cache(self):
"get_dir_cache",
return_value=[{"md5": "asdf"}, {"md5": "qwe"}],
)
def test_return_mutiple_for_dir(self, mock_get_dir_cache):
def test_return_multiple_for_dir(self, mock_get_dir_cache):
o = self._get_output()

self.assertEqual(2, o.get_files_number())
Expand Down