Skip to content

Commit 9e676eb

Browse files
author
GlassOfWhiskey
committed
Install hatchling to build cwl-utils
1 parent c017bac commit 9e676eb

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

.github/workflows/ci-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272

7373
- name: Upgrade setuptools and install tox
7474
run: |
75-
pip install -U pip setuptools wheel
75+
pip install -U pip setuptools wheel hatchling
7676
pip install tox tox-gh-actions
7777
7878
- name: MyPy cache
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: Upgrade setuptools and install tox
121121
run: |
122-
pip install -U pip setuptools wheel
122+
pip install -U pip setuptools wheel hatchling
123123
pip install tox tox-gh-actions
124124
125125
- if: ${{ matrix.step == 'pydocstyle' && github.event_name == 'pull_request'}}
@@ -262,7 +262,7 @@ jobs:
262262

263263
- name: Install packages
264264
run: |
265-
pip install -U pip setuptools wheel
265+
pip install -U pip setuptools wheel hatchling
266266
pip install virtualenv
267267
268268
- name: Release test
@@ -302,7 +302,7 @@ jobs:
302302
tox.ini
303303
- name: Upgrade setuptools and install tox
304304
run: |
305-
pip install -U pip setuptools wheel
305+
pip install -U pip setuptools wheel hatchling
306306
pip install tox tox-gh-actions
307307
# # docker for mac install is not currently stable
308308
# - name: 'SETUP MacOS: load Homebrew cache'

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@ clean: FORCE
8989

9090
# Linting and code style related targets
9191
## sort_import : sorting imports using isort: https://github.com/timothycrosley/isort
92-
sort_imports: $(PYSOURCES) mypy-stubs
92+
sort_imports: $(filter-out cwltool/fast_parser.py,$(PYSOURCES)) mypy-stubs
9393
isort $^
9494

95-
remove_unused_imports: $(PYSOURCES)
95+
remove_unused_imports: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
9696
autoflake --in-place --remove-all-unused-imports $^
9797

9898
pep257: pydocstyle
9999
## pydocstyle : check Python docstring style
100-
pydocstyle: $(PYSOURCES)
100+
pydocstyle:$(filter-out cwltool/fast_parser.py,$(PYSOURCES))
101101
pydocstyle --add-ignore=D100,D101,D102,D103 $^ || true
102102

103-
pydocstyle_report.txt: $(PYSOURCES)
103+
pydocstyle_report.txt: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
104104
pydocstyle setup.py $^ > $@ 2>&1 || true
105105

106106
## diff_pydocstyle_report : check Python docstring style for changed files only
@@ -118,10 +118,10 @@ codespell-fix:
118118

119119
## format : check/fix all code indentation and formatting (runs black)
120120
format:
121-
black --exclude cwltool/schemas setup.py cwltool.py cwltool tests mypy-stubs
121+
black --exclude cwltool/fast_parser.py cwltool/schemas setup.py cwltool.py cwltool tests mypy-stubs
122122

123123
format-check:
124-
black --diff --check --exclude cwltool/schemas setup.py cwltool.py cwltool tests mypy-stubs
124+
black --diff --check --exclude cwltool/fast_parser.py cwltool/schemas setup.py cwltool.py cwltool tests mypy-stubs
125125

126126
## pylint : run static code analysis on Python code
127127
pylint: $(PYSOURCES)
@@ -159,11 +159,11 @@ diff-cover.html: coverage.xml
159159
diff-cover --compare-branch=main $^ --html-report $@
160160

161161
## test : run the cwltool test suite
162-
test: $(PYSOURCES)
162+
test: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
163163
python3 -m pytest ${PYTEST_EXTRA}
164164

165165
## testcov : run the cwltool test suite and collect coverage
166-
testcov: $(PYSOURCES)
166+
testcov: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
167167
python3 -m pytest --cov --cov-config=.coveragerc --cov-report= ${PYTEST_EXTRA}
168168

169169
sloccount.sc: $(PYSOURCES) Makefile
@@ -178,18 +178,18 @@ list-author-emails:
178178
@git log --format='%aN,%aE' | sort -u | grep -v 'root'
179179

180180
mypy3: mypy
181-
mypy: $(PYSOURCES)
181+
mypy: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
182182
MYPYPATH=$$MYPYPATH:mypy-stubs mypy $^
183183

184-
mypyc: $(PYSOURCES)
184+
mypyc: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
185185
MYPYPATH=mypy-stubs CWLTOOL_USE_MYPYC=1 pip install --verbose -e . \
186186
&& pytest -vv ${PYTEST_EXTRA}
187187

188188
shellcheck: FORCE
189189
shellcheck build-cwltool-docker.sh cwl-docker.sh release-test.sh conformance-test.sh \
190190
cwltool-in-docker.sh
191191

192-
pyupgrade: $(PYSOURCES)
192+
pyupgrade: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
193193
pyupgrade --exit-zero-even-if-changed --py310-plus $^
194194
auto-walrus $^
195195

@@ -217,7 +217,7 @@ release:
217217
twine upload testenv2/src/${MODULE}/dist/* && \
218218
git tag ${VERSION} && git push --tags
219219

220-
flake8: $(PYSOURCES)
220+
flake8: $(filter-out cwltool/fast_parser.py,$(PYSOURCES))
221221
flake8 $^
222222

223223
FORCE:

cwltool/fast_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3849,7 +3849,7 @@ def save(
38493849
stdout: random_stdout_filenameABCDEFG
38503850
38513851
3852-
If the ``CommandLineTool`` contains logically chained commands (e.g. ``echo a && echo b``) ``stdout`` must include the output of every command.
3852+
If the ``CommandLineTool`` contains logically chained commands (e.g. ``echo a && echo b``) ``stdout`` must include the output of every command.
38533853
"""
38543854
stderrLoader: Final = _EnumLoader(("stderr",), "stderr")
38553855
"""

0 commit comments

Comments
 (0)