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

fix: update Pydantic version #146

Merged
merged 4 commits into from
Nov 9, 2023
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
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ formats:
- pdf
- epub
conda:
environment: environment.yml
environment: environment-dev.yml
5 changes: 3 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ dependencies:
- pandas >=1.3.5, <1.4.0
- pip >=20.2.3
- pyahocorasick >=1.4.0
- pydantic >=1.8.1, <2
- pydantic >=2, <3
- pylint >=2.4.4
- pysam >=0.16.0
- pytest >=6.1.0
- python >=3.8, <=3.10
- python-semantic-release >=8
- sphinx-rtd-theme
- star >=2.7.6
- pip:
- python-semantic-release>=7.15.0
- -e .
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- pandas >=1.3.5, <1.4.0
- pip >=20.2.3
- pyahocorasick >=1.4.0
- pydantic >=1.8.1, <2
- pydantic >=2, <3
- pysam >=0.16.0
- python >=3.8, <=3.10
- star >=2.7.6
Expand Down
3 changes: 1 addition & 2 deletions htsinfer/htsinfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,7 @@ def clean_up(self):
def print(self):
"""Print results to STDOUT."""
sys.stdout.write(
self.config.results.json(
self.config.results.model_dump_json(
indent=3,
sort_keys=False,
) + linesep
)
6 changes: 3 additions & 3 deletions tests/test_htsinfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def test_clean_up_keep_none(self, tmpdir):
def test_clean_up_keep_results(self, tmpdir):
"""Remove temporary data."""
arguments = Args(path_1=FILE_MATE_1,
out_dir=tmpdir,
out_dir=tmpdir.strpath,
tmpdir=tmpdir,
)
results = Results()
Expand All @@ -323,8 +323,8 @@ def test_clean_up_keep_results(self, tmpdir):
def test_clean_up_keep_all(self, tmpdir):
"""Remove no data."""
arguments = Args(path_1=FILE_MATE_1,
out_dir=tmpdir,
tmpdir=tmpdir,
out_dir=tmpdir.strpath,
tmpdir=tmpdir.strpath,
)
results = Results()
configs = Config(
Expand Down
Loading