Skip to content

Commit

Permalink
Merge pull request #55 from pyiron/fixes
Browse files Browse the repository at this point in the history
Update version - plus match series fixes
  • Loading branch information
jan-janssen authored Oct 5, 2021
2 parents bc48cc3 + 69fad1e commit b885b08
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
channels:
- conda-forge
dependencies:
- pyiron_base=0.3.2
- pyiron_base=0.3.5
- matplotlib=3.4.3
- temmeta=0.0.6
- pystem =0.0.26
Expand Down
19 changes: 17 additions & 2 deletions pyiron_experimental/matchseries.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import os
import scanf
from pyiron_base import TemplateJob, GenericParameters
from pyiron_base import GenericJob, GenericParameters


class MatchSeries(TemplateJob):
class MatchSeries(GenericJob):
def __init__(self, project, job_name):
super().__init__(project, job_name)
self.input = MatchSeriesInput()
Expand All @@ -24,7 +24,22 @@ def write_input(self):

def collect_output(self):
pass

def to_hdf(self, hdf=None, group_name=None):
super().to_hdf(
hdf=hdf,
group_name=group_name
)
with self.project_hdf5.open("input") as h5in:
self.input.to_hdf(h5in)

def from_hdf(self, hdf=None, group_name=None):
super().from_hdf(
hdf=hdf,
group_name=group_name
)
with self.project_hdf5.open("input") as h5in:
self.input.from_hdf(h5in)


class MatchSeriesInput(GenericParameters):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
keywords='pyiron',
packages=find_packages(exclude=["*tests*"]),
install_requires=[
'pyiron_base==0.3.2',
'pyiron_base==0.3.5',
'matplotlib==3.4.3',
'temmeta==0.0.6',
'pystem==0.0.26',
Expand Down

0 comments on commit b885b08

Please sign in to comment.