Skip to content

Commit

Permalink
Merge pull request #248 from datalad/windows-jq
Browse files Browse the repository at this point in the history
ENH: don't install jq dependency on windows
  • Loading branch information
jsheunis authored Feb 21, 2023
2 parents 06623fb + 601a6a5 commit 595c756
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import platform

if platform.system() == 'Windows':
collect_ignore_glob = ["*workflow.py", "*workflows.py"]
3 changes: 2 additions & 1 deletion datalad_catalog/tests/test_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
assert_equal,
assert_repo_status,
skip_if_adjusted_branch,
skip_if_on_windows,
)
from datalad.api import create, Dataset

Expand Down Expand Up @@ -297,7 +298,7 @@
},
}


@skip_if_on_windows
@skip_if_adjusted_branch
@with_tree(tree=super_ds_tree)
@with_tempfile(mkdir=True)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ install_requires =
datalad-metalad >= 0.4.6
jsonschema
pyyaml
jq
jq;platform_system!='Windows'
packages = find:
include_package_data = True

Expand Down

0 comments on commit 595c756

Please sign in to comment.