Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run-pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ["3.8", "3.11"]
python-version: ["3.10", "3.13"]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand Down
2 changes: 1 addition & 1 deletion eido/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.4"
__version__ = "0.2.5"
3 changes: 1 addition & 2 deletions eido/conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import inspect
from logging import getLogger
import os
from typing import NoReturn

from .exceptions import *

Expand Down Expand Up @@ -107,7 +106,7 @@ def run_filter(prj, filter_name, verbose=True, plugin_kwargs=None):
return conv_result


def save_result(result_path: str, content: str) -> NoReturn:
def save_result(result_path: str, content: str) -> None:
with open(result_path, "w") as f:
f.write(content)

Expand Down
2 changes: 1 addition & 1 deletion eido/conversion_plugins.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
""" built-in PEP filters """
"""built-in PEP filters"""

from typing import Dict
from .output_formatters import MultilineOutputFormatter
Expand Down
2 changes: 1 addition & 1 deletion eido/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
""" Exceptions for specific eido issues. """
"""Exceptions for specific eido issues."""

from abc import ABCMeta

Expand Down
10 changes: 5 additions & 5 deletions eido/validation.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from typing import NoReturn, Mapping, Union
from typing import Mapping, Union
from copy import deepcopy as dpcpy
from logging import getLogger

Expand Down Expand Up @@ -60,15 +60,15 @@ def _validate_object(obj: Mapping, schema: Union[str, dict], sample_name_colname
_LOGGER.debug("Validation was successful...")


def validate_project(project: peppy.Project, schema: Union[str, dict]) -> NoReturn:
def validate_project(project: peppy.Project, schema: Union[str, dict]) -> None:
"""
Validate a project object against a schema

:param peppy.Project project: a project object to validate
:param str | dict schema: schema dict to validate against or a path to one
from the error. Useful when used ith large projects

:return: NoReturn
:return: None
:raises EidoValidationError: if validation is unsuccessful
"""
sample_name_colname = project.sample_name_colname
Expand Down Expand Up @@ -100,7 +100,7 @@ def _validate_sample_object(sample: peppy.Sample, schemas):

def validate_sample(
project: peppy.Project, sample_name: Union[str, int], schema: Union[str, dict]
) -> NoReturn:
) -> None:
"""
Validate the selected sample object against a schema

Expand All @@ -123,7 +123,7 @@ def validate_sample(

def validate_config(
project: Union[peppy.Project, dict], schema: Union[str, dict]
) -> NoReturn:
) -> None:
"""
Validate the config part of the Project object against a schema

Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-all.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
importlib-metadata; python_version < '3.10'
jsonschema>=3.0.1
logmuse>=0.2.5
pandas
pandas<3.0.0
peppy>=0.40.7
ubiquerg>=0.5.2