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

Import only from pyiron_base directly #459

Merged
merged 3 commits into from
Jul 22, 2022
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 .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- codacy-coverage
- matplotlib =3.5.2
- numpy =1.23.1
- pyiron_base =0.5.17
- pyiron_base =0.5.19
- pyiron_atomistics =0.2.50
- pyparsing =3.0.9
- scipy =1.8.1
Expand Down
2 changes: 1 addition & 1 deletion pyiron_contrib/RDM/storagejob.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import shutil

from pyiron_base import GenericJob, DataContainer
from pyiron_base.generic.filedata import FileData
from pyiron_base import FileData
from pyiron_contrib.generic.s3io import FileS3IO


Expand Down
2 changes: 1 addition & 1 deletion pyiron_contrib/atomistics/atomicrex/interactive.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import posixpath, os, time

from scipy import optimize
from pyiron_base.job.interactive import InteractiveBase
from pyiron_base import InteractiveBase

from pyiron_contrib.atomistics.atomicrex.general_input import ScipyAlgorithm
from pyiron_contrib.atomistics.atomicrex.base import AtomicrexBase
Expand Down
2 changes: 1 addition & 1 deletion pyiron_contrib/atomistics/runner/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from pyiron import Project
from pyiron_base import ProjectHDFio, FlattenedStorage
from pyiron_base import state, Executable, GenericJob, DataContainer
from pyiron_base.generic.object import HasStorage
from pyiron_base import HasStorage

from pyiron_contrib.atomistics.ml.potentialfit import PotentialFit
from pyiron_contrib.atomistics.atomistics.job import (TrainingContainer,
Expand Down
2 changes: 1 addition & 1 deletion pyiron_contrib/atomistics/runner/storageclasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
RunnerFitResults,
RunnerWeights, RunnerScaling)
from pyiron_base import ProjectHDFio
from pyiron_base.interfaces.has_hdf import HasHDF
from pyiron_base import HasHDF
from pyiron_base import FlattenedStorage

from .utils import pad, unpad
Expand Down
4 changes: 2 additions & 2 deletions pyiron_contrib/generic/s3io.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import boto3
from botocore.client import Config

from pyiron_base.interfaces.has_groups import HasGroups
from pyiron_base.generic.filedata import load_file, FileDataTemplate
from pyiron_base import HasGroups
from pyiron_base import load_file, FileDataTemplate


class S3FileData(FileDataTemplate):
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 @@
install_requires=[
'matplotlib==3.5.2',
'numpy==1.23.1',
'pyiron_base==0.5.17',
'pyiron_base==0.5.19',
'scipy==1.8.1',
'seaborn==0.11.2',
'pyparsing==3.0.9'
Expand Down
2 changes: 1 addition & 1 deletion tests/RDM/test_storagejob.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from pyiron_contrib.RDM.storagejob import StorageJob
from pyiron_contrib.generic.s3io import FileS3IO
from pyiron_base._tests import TestWithCleanProject
from pyiron_base.generic.filedata import FileDataTemplate
from pyiron_base import FileDataTemplate

full_bucket = "full_bucket"
io_bucket = "io_bucket"
Expand Down