Skip to content

Commit

Permalink
Lighten the import of pyiron_contrib
Browse files Browse the repository at this point in the history
In the main init, only pyiron_base is imported to update the JOB_CLASS_DICT.
  • Loading branch information
niklassiemer committed Jan 23, 2024
1 parent b764f4c commit e76722b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
3 changes: 2 additions & 1 deletion notebooks/coscine_io.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
}
],
"source": [
"from pyiron import Project"
"from pyiron import Project\n",
"import pyiron_contrib.RDM"
]
},
{
Expand Down
11 changes: 11 additions & 0 deletions pyiron_contrib/RDM/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import warnings


try:
from pyiron import Project
except:
warnings.warn("pyiron module not found, importing Project from pyiron_base")
from pyiron_base import Project

from pyiron_contrib.generic.storage_interface_toolkit import StorageInterfaceFactory
Project.register_tools("storage_interface", StorageInterfaceFactory)
15 changes: 7 additions & 8 deletions pyiron_contrib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@

import warnings

try:
from pyiron import Project
except:
warnings.warn("pyiron module not found, importing Project from pyiron_base")
from pyiron_base import Project
from pyiron_base import Project as BaseProject, JOB_CLASS_DICT

from pyiron_base import JOB_CLASS_DICT
from pyiron_contrib.generic.storage_interface_toolkit import StorageInterfaceFactory

Project.register_tools("storage_interface", StorageInterfaceFactory)
class Project(BaseProject):
def __init__(self, *args, **kwargs):
warnings.warn("Importing Project from pyiron_contrib is deprecated. "
"Import from appropriate pyiron module (e.g. pyiron) instead.")
super().__init__(*args, **kwargs)


# Make classes available for new pyiron version
JOB_CLASS_DICT.update(
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/RDM/test_storagejob.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from shutil import rmtree
from moto import mock_s3
import boto3
from pyiron_contrib import Project
from pyiron_base import Project
import pyiron_contrib
from pyiron_contrib.RDM.storagejob import StorageJob
from pyiron_contrib.generic.s3io import FileS3IO
from pyiron_base._tests import TestWithCleanProject
Expand Down

0 comments on commit e76722b

Please sign in to comment.