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

Implement DataSchema-5.1 #42

Merged
merged 29 commits into from
Jun 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Process encoding=None and ruff
PeterKraus committed May 17, 2024
commit e8741cbd2b4a1a9f5d472e6d462193833484f684
1 change: 0 additions & 1 deletion src/dgbowl_schemas/yadg/dataschema_4_2/step.py
Original file line number Diff line number Diff line change
@@ -164,7 +164,6 @@ class ElectroChem(BaseModel, extra=Extra.forbid):
"""Parser for electrochemistry files."""

class Params(BaseModel, extra=Extra.forbid):

filetype: Literal["eclab.mpt", "eclab.mpr", "tomato.json"] = "eclab.mpr"

transpose: bool = True
7 changes: 6 additions & 1 deletion src/dgbowl_schemas/yadg/dataschema_5_1/filetype.py
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@ def warn_deprecated(cls, v):

class EClab_mpt(FileType):
filetype: Literal["eclab.mpt", "biologic-mpt"]
encoding: str = "windows-1252"
encoding: Optional[str] = "windows-1252"

@field_validator("filetype")
@classmethod
@@ -148,6 +148,11 @@ def warn_deprecated(cls, v):
v = ok
return v

@field_validator("encoding")
@classmethod
def set_encoding(cls, encoding):
return encoding or "windows-1252"


class EmpaLC_csv(FileType):
filetype: Literal["empalc.csv"]
4 changes: 1 addition & 3 deletions versioneer.py
Original file line number Diff line number Diff line change
@@ -479,9 +479,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
return stdout, process.returncode


LONG_VERSION_PY[
"git"
] = r'''
LONG_VERSION_PY["git"] = r'''
# This file helps to compute a version number in source trees obtained from
# git-archive tarball (such as those provided by githubs download-from-tag
# feature). Distribution tarballs (built by setup.py sdist) and build