Skip to content

Delete "dirname" also for type Directory #2281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adrabent wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Delete "dirname" also for type Directory #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2d0ba3
Delete "dirname" also for type Directory
adrabent Jun 2, 2026
5626437
type fix
mr-c Jun 15, 2026
34951ab
DO NOT MERGE; disable codecov
mr-c Jun 15, 2026
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
21 changes: 1 addition & 20 deletions .github/workflows/ci-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@ jobs:
- name: Test with tox
run: APPTAINER_TMPDIR=${RUNNER_TEMP} tox

- name: Upload coverage to Codecov
if: ${{ matrix.step == 'unit' }}
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6
with:
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

tox-style:
name: Linters
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -228,12 +220,6 @@ jobs:
name: cwl-${{ matrix.cwl-version }}-${{ matrix.container }}${{ matrix.extras }}-conformance-results
path: |
**/cwltool_conf*.xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6
with:
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
release_test:
name: cwltool release test
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -317,9 +303,4 @@ jobs:
# uses: docker-practice/actions-setup-docker@master
- name: Test with tox
run: tox
- name: Upload coverage to Codecov
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6
with:
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

4 changes: 2 additions & 2 deletions cwltool/command_line_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ def revmap_file(
f["location"] = builder.fs_access.join(outdir, f["location"])
return f

if is_file(f) and "dirname" in f:
del f["dirname"]
if "dirname" in f:
del f["dirname"] # type: ignore[typeddict-item]

if "path" in f:
path = builder.fs_access.join(builder.outdir, f["path"])
Expand Down
Loading