From fffb217328023db36c8a530f17b1ec23a3046cb3 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Fri, 19 Aug 2022 11:17:03 +1200 Subject: [PATCH 1/2] Fix codespell. --- CODE_OF_CONDUCT.md | 2 +- Makefile | 2 +- cwltool/run_job.py | 2 +- setup.cfg | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 69c811cac..189d9bf91 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -57,7 +57,7 @@ Reporting If you are being harassed by a member of the CWL Project, notice that someone else is being harassed, or have any other concerns, please contact the CWL Leadership Team at leadership@commonwl.org. If person who is harassing -you is on the team, they will recuse themselves from handling your incident. We +you is on the team, they will recurse themselves from handling your incident. We will respond as promptly as we can. This code of conduct applies to CWL Project spaces, but if you are being diff --git a/Makefile b/Makefile index 7b04c1dcf..f0f65168e 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ pydocstyle_report.txt: $(PYSOURCES) diff_pydocstyle_report: pydocstyle_report.txt diff-quality --compare-branch=main --violations=pydocstyle --fail-under=100 $^ -## codespell : check for common mispellings +## codespell : check for common misspellings codespell: codespell -w $(shell git ls-files | grep -v cwltool/schemas | grep -v cwltool/jshint/ | grep -v mypy-stubs) diff --git a/cwltool/run_job.py b/cwltool/run_job.py index 93b4e8a94..ac2f1025d 100644 --- a/cwltool/run_job.py +++ b/cwltool/run_job.py @@ -42,7 +42,7 @@ def main(argv: List[str]) -> int: "stdout_path": a string (or a null) giving the path that should receive the STDOUT "stderr_path": a string (or a null) giving the path that should receive the STDERR - The second argument is optional, it specifes a shell script to execute prior, + The second argument is optional, it specifies a shell script to execute prior, and the environment variables it sets will be combined with the environment variables from the "env" key in the JSON dictionary from the first argument. """ diff --git a/setup.cfg b/setup.cfg index 11b473f31..42f8e1822 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,3 +13,6 @@ include_trailing_comma = True force_grid_wrap = 0 use_parentheses = True line_length = 88 + +[codespell] +ignore-words-list=ORE,ore,RO,ro From e97918a397c0108b1f0483247c3abfb99dc8eee9 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com> Date: Fri, 19 Aug 2022 09:00:53 +0200 Subject: [PATCH 2/2] =?UTF-8?q?revert=20recuse=E2=86=92recurse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 189d9bf91..69c811cac 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -57,7 +57,7 @@ Reporting If you are being harassed by a member of the CWL Project, notice that someone else is being harassed, or have any other concerns, please contact the CWL Leadership Team at leadership@commonwl.org. If person who is harassing -you is on the team, they will recurse themselves from handling your incident. We +you is on the team, they will recuse themselves from handling your incident. We will respond as promptly as we can. This code of conduct applies to CWL Project spaces, but if you are being