Skip to content

ENH: Use attrs namespace #24

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

Merged
merged 2 commits into from
Nov 21, 2022
Merged

ENH: Use attrs namespace #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d8adeb
ENH: Use attrs namespace
ghisvail Nov 21, 2022
57b4fd4
MNT: Add minimum version to attrs
ghisvail Nov 21, 2022
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
8 changes: 3 additions & 5 deletions pydra/tasks/nipype1/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pydra
import nipype
import attr
import attrs
import typing as ty


Expand All @@ -9,7 +9,7 @@ def traitedspec_to_specinfo(traitedspec):
return pydra.specs.SpecInfo(
name="Inputs",
fields=[
(name, attr.ib(type=ty.Any, metadata={"help_string": trait.desc}))
(name, attrs.field(metadata={"help_string": trait.desc}))
for name, trait in traitedspec.traits().items()
if name in trait_names
],
Expand Down Expand Up @@ -67,9 +67,7 @@ def __init__(
self.output_spec = traitedspec_to_specinfo(interface._outputs())

def _run_task(self):
inputs = attr.asdict(
self.inputs, filter=lambda a, v: v is not attr.NOTHING, retain_collection_types=True
)
inputs = attrs.asdict(self.inputs, filter=lambda a, v: v is not attrs.NOTHING)
node = nipype.Node(self._interface, base_dir=self.output_dir, name=self.name)
node.inputs.trait_set(**inputs)
res = node.run()
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ python_requires = >=3.7
install_requires =
pydra >= 0.6.2
nipype
attrs >= 21.3.0
packages = find_namespace:

[options.packages.find]
Expand Down