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

Switch to pyiron_dataclasses module #1657

Merged
merged 2 commits into from
Oct 4, 2024
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
1 change: 1 addition & 0 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies:
- pint =0.24.3
- psutil =6.0.0
- pyfileindex =0.0.29
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.4
- executorlib =0.0.3
- pysqa =0.2.0
Expand Down
1 change: 1 addition & 0 deletions .ci_support/environment-mini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dependencies:
- pandas =2.2.3
- psutil =6.0.0
- pyfileindex =0.0.29
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.3
- executorlib =0.0.3
- pysqa =0.2.0
Expand Down
1 change: 1 addition & 0 deletions .ci_support/environment-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- pint =0.18
- psutil =5.8.0
- pyfileindex =0.0.16
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.3
- executorlib =0.0.1
- pysqa =0.1.12
Expand Down
1 change: 1 addition & 0 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies:
- pint =0.24.3
- psutil =6.0.0
- pyfileindex =0.0.29
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.4
- executorlib =0.0.3
- pysqa =0.2.0
Expand Down
1 change: 1 addition & 0 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies:
- pint =0.24.3
- psutil =6.0.0
- pyfileindex =0.0.29
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.4
- executorlib =0.0.3
- pysqa =0.2.0
Expand Down
Empty file.
31 changes: 0 additions & 31 deletions pyiron_base/dataclasses/job.py

This file was deleted.

2 changes: 1 addition & 1 deletion pyiron_base/jobs/job/extension/executable.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from dataclasses import asdict, fields
from typing import List, Optional, Tuple, Union

from pyiron_dataclasses.v1.job import Executable as ExecutableDataClass
from pyiron_snippets.resources import ExecutableResolver

from pyiron_base.dataclasses.job import Executable as ExecutableDataClass
from pyiron_base.interfaces.has_dict import HasDict
from pyiron_base.state import state

Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/jobs/job/extension/server/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
from typing import Optional, Union

import pandas
from pyiron_dataclasses.v1.job import Server as ServerDataClass
from pyiron_snippets.deprecate import deprecate

from pyiron_base.dataclasses.job import Server as ServerDataClass
from pyiron_base.interfaces.has_dict import HasDict
from pyiron_base.interfaces.lockable import Lockable, sentinel
from pyiron_base.jobs.job.extension.server.runmode import Runmode
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["cloudpickle", "executorlib", "h5io_browser", "h5py", "numpy", "monty", "pandas", "psutil", "pyfileindex", "pyiron_snippets", "pysqa", "sqlalchemy", "tables", "tqdm", "traitlets", "setuptools", "versioneer[toml]==0.29"]
requires = ["cloudpickle", "executorlib", "h5io_browser", "h5py", "numpy", "monty", "pandas", "psutil", "pyfileindex", "pyiron_dataclasses", "pyiron_snippets", "pysqa", "sqlalchemy", "tables", "tqdm", "traitlets", "setuptools", "versioneer[toml]==0.29"]
build-backend = "setuptools.build_meta"

[project]
Expand Down Expand Up @@ -32,6 +32,7 @@ dependencies = [
"pandas==2.2.3",
"psutil==6.0.0",
"pyfileindex==0.0.29",
"pyiron_dataclasses==0.0.1",
"pyiron_snippets==0.1.4",
"pysqa==0.2.0",
"sqlalchemy==2.0.35",
Expand Down
Loading