Skip to content
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.

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

guard import fcntl for windows #1914

Merged
merged 1 commit into from
Sep 27, 2023

Conversation

jfennick
Copy link
Contributor

This PR is essentially identical to #1822 It simply guards the import fcntl on windows so that the proper error message can be displayed.

@jfennick jfennick changed the title guard import tcntl for windows guard import fcntl for windows Sep 27, 2023
Copy link
Member

@mr-c mr-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make cleanup :-)

@mr-c mr-c enabled auto-merge (rebase) September 27, 2023 15:16
@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

Merging #1914 (0f89f01) into main (20f01e0) will decrease coverage by 0.01%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##             main    #1914      +/-   ##
==========================================
- Coverage   83.95%   83.94%   -0.01%     
==========================================
  Files          46       46              
  Lines        8162     8165       +3     
  Branches     2168     2168              
==========================================
+ Hits         6852     6854       +2     
+ Misses        841      840       -1     
- Partials      469      471       +2     
Files Coverage Δ
cwltool/utils.py 83.95% <50.00%> (-0.58%) ⬇️

... and 2 files with indirect coverage changes

@mr-c mr-c disabled auto-merge September 27, 2023 15:16
@mr-c mr-c enabled auto-merge (squash) September 27, 2023 15:17
auto-merge was automatically disabled September 27, 2023 15:35

Head branch was pushed to by a user without write access

@jfennick
Copy link
Contributor Author

FYI build_test_container is failing due to an (apparently) unrelated error with schema-salad:
schema-salad ... has inconsistent version: expected '8.4.20230426093816', but metadata has '8.4'
https://github.com/common-workflow-language/cwltool/actions/runs/6328208603/job/17185819443?pr=1914#step:3:263

@mr-c
Copy link
Member

mr-c commented Sep 27, 2023

@jfennick Thanks for a heads up; I made a new schema-salad release since the issue was already fixed

@mr-c mr-c merged commit cf3e49f into common-workflow-language:main Sep 27, 2023
40 of 42 checks passed
@jfennick jfennick deleted the guard_import_fcntl branch October 3, 2023 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants