From 12e94fe1a15bc8b728208c7c8e3c92cf1adb6a48 Mon Sep 17 00:00:00 2001 From: Michael Hanke Date: Tue, 3 Oct 2023 10:02:55 +0200 Subject: [PATCH] Fix a whole bunch of typos --- CHANGELOG.md | 4 ++-- datalad_next/annexremotes/uncurl.py | 2 +- datalad_next/commands/download.py | 2 +- datalad_next/constraints/tests/test_basic.py | 4 ++-- datalad_next/credman/manager.py | 2 +- datalad_next/gitremotes/datalad_annex.py | 2 +- datalad_next/patches/configuration.py | 2 +- datalad_next/patches/distribution_dataset.py | 2 +- datalad_next/patches/push_optimize.py | 4 ++-- datalad_next/utils/requests_auth.py | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b0ced7..55aafdfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) @@ -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 diff --git a/datalad_next/annexremotes/uncurl.py b/datalad_next/annexremotes/uncurl.py index 19f27c1c..51dade90 100644 --- a/datalad_next/annexremotes/uncurl.py +++ b/datalad_next/annexremotes/uncurl.py @@ -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 ...) diff --git a/datalad_next/commands/download.py b/datalad_next/commands/download.py index 4f61e211..927079b3 100644 --- a/datalad_next/commands/download.py +++ b/datalad_next/commands/download.py @@ -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. diff --git a/datalad_next/constraints/tests/test_basic.py b/datalad_next/constraints/tests/test_basic.py index 2748a158..9b0d12c4 100644 --- a/datalad_next/constraints/tests/test_basic.py +++ b/datalad_next/constraints/tests/test_basic.py @@ -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 diff --git a/datalad_next/credman/manager.py b/datalad_next/credman/manager.py index 60124e2f..5e85c6a1 100644 --- a/datalad_next/credman/manager.py +++ b/datalad_next/credman/manager.py @@ -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 ' \ diff --git a/datalad_next/gitremotes/datalad_annex.py b/datalad_next/gitremotes/datalad_annex.py index 55c86074..135a64c4 100755 --- a/datalad_next/gitremotes/datalad_annex.py +++ b/datalad_next/gitremotes/datalad_annex.py @@ -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'" diff --git a/datalad_next/patches/configuration.py b/datalad_next/patches/configuration.py index e718141e..77c66e65 100644 --- a/datalad_next/patches/configuration.py +++ b/datalad_next/patches/configuration.py @@ -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): diff --git a/datalad_next/patches/distribution_dataset.py b/datalad_next/patches/distribution_dataset.py index f637006d..4a56113d 100644 --- a/datalad_next/patches/distribution_dataset.py +++ b/datalad_next/patches/distribution_dataset.py @@ -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__ diff --git a/datalad_next/patches/push_optimize.py b/datalad_next/patches/push_optimize.py index 67f91591..b2887665 100644 --- a/datalad_next/patches/push_optimize.py +++ b/datalad_next/patches/push_optimize.py @@ -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 diff --git a/datalad_next/utils/requests_auth.py b/datalad_next/utils/requests_auth.py index 742e1d1a..62cb5a49 100644 --- a/datalad_next/utils/requests_auth.py +++ b/datalad_next/utils/requests_auth.py @@ -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.