diff --git a/poetry.lock b/poetry.lock index a9d2517..6440b66 100644 --- a/poetry.lock +++ b/poetry.lock @@ -119,29 +119,29 @@ files = [ [[package]] name = "filelock" -version = "3.16.0" +version = "3.16.1" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.16.0-py3-none-any.whl", hash = "sha256:f6ed4c963184f4c84dd5557ce8fece759a3724b37b80c6c4f20a2f63a4dc6609"}, - {file = "filelock-3.16.0.tar.gz", hash = "sha256:81de9eb8453c769b63369f87f11131a7ab04e367f8d97ad39dc230daa07e3bec"}, + {file = "filelock-3.16.1-py3-none-any.whl", hash = "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0"}, + {file = "filelock-3.16.1.tar.gz", hash = "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435"}, ] [package.extras] -docs = ["furo (>=2024.8.6)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "diff-cover (>=9.1.1)", "pytest (>=8.3.2)", "pytest-asyncio (>=0.24)", "pytest-cov (>=5)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv (>=20.26.3)"] +docs = ["furo (>=2024.8.6)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4.1)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "diff-cover (>=9.2)", "pytest (>=8.3.3)", "pytest-asyncio (>=0.24)", "pytest-cov (>=5)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv (>=20.26.4)"] typing = ["typing-extensions (>=4.12.2)"] [[package]] name = "identify" -version = "2.6.0" +version = "2.6.1" description = "File identification library for Python" optional = false python-versions = ">=3.8" files = [ - {file = "identify-2.6.0-py2.py3-none-any.whl", hash = "sha256:e79ae4406387a9d300332b5fd366d8994f1525e8414984e1a59e058b2eda2dd0"}, - {file = "identify-2.6.0.tar.gz", hash = "sha256:cb171c685bdc31bcc4c1734698736a7d5b6c8bf2e0c15117f4d469c8640ae5cf"}, + {file = "identify-2.6.1-py2.py3-none-any.whl", hash = "sha256:53863bcac7caf8d2ed85bd20312ea5dcfc22226800f6d6881f232d861db5a8f0"}, + {file = "identify-2.6.1.tar.gz", hash = "sha256:91478c5fb7c3aac5ff7bf9b4344f803843dc586832d5f110d672b19aa1984c98"}, ] [package.extras] @@ -344,13 +344,13 @@ dev = ["hypothesis", "mypy", "pdoc-pyo3-sample-library (==1.0.11)", "pygments (> [[package]] name = "platformdirs" -version = "4.3.2" +version = "4.3.6" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.3.2-py3-none-any.whl", hash = "sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617"}, - {file = "platformdirs-4.3.2.tar.gz", hash = "sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c"}, + {file = "platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"}, + {file = "platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"}, ] [package.extras] @@ -556,13 +556,13 @@ files = [ [[package]] name = "virtualenv" -version = "20.26.4" +version = "20.26.5" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.26.4-py3-none-any.whl", hash = "sha256:48f2695d9809277003f30776d155615ffc11328e6a0a8c1f0ec80188d7874a55"}, - {file = "virtualenv-20.26.4.tar.gz", hash = "sha256:c17f4e0f3e6036e9f26700446f85c76ab11df65ff6d8a9cbfad9f71aabfcf23c"}, + {file = "virtualenv-20.26.5-py3-none-any.whl", hash = "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6"}, + {file = "virtualenv-20.26.5.tar.gz", hash = "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4"}, ] [package.dependencies] diff --git a/pyproject.toml b/pyproject.toml index a50c0fe..6e2e53f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "styx" +name = "styxcompiler" version = "0.1.0" description = "Boutiques code generator" authors = ["Florian Rupprecht "] diff --git a/src/styx/backend/python/__init__.py b/src/styx/backend/python/__init__.py index e91a1c2..1afa15e 100644 --- a/src/styx/backend/python/__init__.py +++ b/src/styx/backend/python/__init__.py @@ -1,4 +1,4 @@ """Python wrapper backend.""" -from .core import to_python as to_python from .core import styxdefs_compat as styxdefs_compat +from .core import to_python as to_python diff --git a/src/styx/backend/python/interface.py b/src/styx/backend/python/interface.py index 8a49ec6..bc5a76c 100644 --- a/src/styx/backend/python/interface.py +++ b/src/styx/backend/python/interface.py @@ -297,7 +297,7 @@ def _compile_outputs_class( if isinstance(sub_struct, ir.IList): docs_append = "This is a list of outputs with the same length and order as the inputs." - input_types_human = ' or '.join([enquote(t, '`') for t in alt_input_types]) + input_types_human = " or ".join([enquote(t, "`") for t in alt_input_types]) outputs_class.fields.append( PyArg( name=output_symbol, @@ -401,7 +401,10 @@ def _py_get_val( # Need to check for attr because some alts might have outputs others not. # todo: think about alternative solutions func.body.extend( - indent([f"{output_symbol}=" f"[i.outputs(execution) if hasattr(i, \"outputs\") else None for i in {output_symbol_resolved}]{opt},"]) + indent([ + f"{output_symbol}=" + f'[i.outputs(execution) if hasattr(i, "outputs") else None for i in {output_symbol_resolved}]{opt},' + ]) ) else: o = f"{output_symbol_resolved}.outputs(execution)" diff --git a/src/styx/frontend/boutiques/core.py b/src/styx/frontend/boutiques/core.py index 90aa2f4..590bea4 100644 --- a/src/styx/frontend/boutiques/core.py +++ b/src/styx/frontend/boutiques/core.py @@ -235,7 +235,7 @@ def _arg_elem_from_bt_elem( param=dparam, list_=dlist, default_value_set_to_none=True, - resolve_parent=d.get("resolve-parent") + resolve_parent=d.get("resolve-parent"), ) case InputTypePrimitive.Flag: