Skip to content

Commit

Permalink
Merge pull request datalad#461 from mih/typos
Browse files Browse the repository at this point in the history
Fix a whole bunch of typos
  • Loading branch information
mih committed Oct 3, 2023
2 parents a3a4e20 + 12e94fe commit e5a2e40
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ For details, please see the changelogs of the 1.0.0 beta releases below.
https://github.com/datalad/datalad-next/pull/391 (by @mih)

- The `main()` entrypoint of the `datalad-annex` Git remote helper has
be generalized to be more re-usable by other (derived) remote helper
be generalized to be more reusable by other (derived) remote helper
implementations.
https://github.com/datalad/datalad-next/pull/411 (by @mih)

Expand Down Expand Up @@ -358,7 +358,7 @@ For details, please see the changelogs of the 1.0.0 beta releases below.
- The CredentialManager was elevated to a top-level module
([#229](https://github.com/datalad/datalad-next/pull/220) by @mih)
- Dataset-lookup behavior of the ``credentials`` command became identical to
``downlad`` ([#256](https://github.com/datalad/datalad-next/pull/256) by
``download`` ([#256](https://github.com/datalad/datalad-next/pull/256) by
@mih)

- The DataLad runner performance patch and all patches to clone functionality
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/annexremotes/uncurl.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
password (repeat):
Enter a name to save the credential
(for accessing http://httpbin.org/basic-auth/myuser/mypassword) securely for future
re-use, or 'skip' to not save the credential
reuse, or 'skip' to not save the credential
name: httpbin-dummy
addurl http://httpbin.org/basic-auth/myuser/mypassword (from uncurl) (to ...)
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/commands/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class Download(ValidatedInterface):
In contrast to other downloader tools, this command integrates with the
DataLad credential management and is able to auto-discover credentials.
If no credential is available, it automatically prompts for them, and
offers to store them for re-use after a successful authentication.
offers to store them for reuse after a successful authentication.
Simultaneous hashing (checksumming) of downloaded content is supported
with user-specified algorithms.
Expand Down
4 changes: 2 additions & 2 deletions datalad_next/constraints/tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ def test_bool():
# this should always work
assert c(True) is True
assert c(False) is False
# all that resuls in True
# all that results in True
assert c('True') is True
assert c('true') is True
assert c('1') is True
assert c('yes') is True
assert c('on') is True
assert c('enable') is True
# all that resuls in False
# all that results in False
assert c('false') is False
assert c('False') is False
assert c('0') is False
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/credman/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ def set(self,
prompt = 'Enter a name to save the credential'
if _context:
prompt = f'{prompt} ({_context})'
prompt = f"{prompt} securely for future re-use, " \
prompt = f"{prompt} securely for future reuse, " \
"or 'skip' to not save the credential"
if _suggested_name:
prompt = f'{prompt}, or leave empty to accept the name ' \
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/gitremotes/datalad_annex.py
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@ def make_export_tree(repo):
ID of the tree object, suitable for `git-annex export`.
"""
here = repo.config.get('annex.uuid')
# re-use existing, or go with fixed random one
# reuse existing, or go with fixed random one
origin = repo.config.get('remote.origin.annex-uuid',
'8249ffce-770a-11ec-9578-5f6af5e76eaa')
assert here, "No 'here'"
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/patches/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __call__(
raise ValueError(
'Scope selection is not supported for dumping')

# normalize variable specificatons
# normalize variable specifications
specs = []
for s in ensure_list(spec):
if isinstance(s, tuple):
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/patches/distribution_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ def resolve_path(path, ds=None, ds_resolved=None):
resolve_path,
msg='Apply datalad-next patch to distribution.dataset:resolve_path')

# re-use docs
# reuse docs
resolve_path.__doc__ = orig_resolve_path.__doc__
4 changes: 2 additions & 2 deletions datalad_next/patches/push_optimize.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,12 @@ def _get_push_target(repo, target_arg):
-------
str or None, str, str or None, list or None
Target label, if determined; status label; optional message;
git-push-dryrun result for re-use or None, if no dry-run was
git-push-dryrun result for reuse or None, if no dry-run was
attempted.
"""
# verified or auto-detected
target = None
# for re-use
# for reuse
wannabe_gitpush = None
if not target_arg:
# let Git figure out what needs doing
Expand Down
2 changes: 1 addition & 1 deletion datalad_next/utils/requests_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def handle_401(self, r, **kwargs):
header is ignored.
Server-provided 'www-authenticated' challenges are inspected, and
corresponding credentials are looked-up (if needed) and subequently
corresponding credentials are looked-up (if needed) and subsequently
tried in a re-request to the original URL after performing any
necessary actions to meet a given challenge. Such a re-request
is then using the same connection as the original request.
Expand Down

0 comments on commit e5a2e40

Please sign in to comment.