From 8dda25ebeeabde500a52ebb857a01b048791cb7a Mon Sep 17 00:00:00 2001 From: Niklas Siemer <70580458+niklassiemer@users.noreply.github.com> Date: Wed, 3 Aug 2022 12:33:05 +0200 Subject: [PATCH 1/3] Update environment.yml --- .ci_support/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index ead923f3c..78cc85a17 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -16,7 +16,7 @@ dependencies: - pandas =1.4.3 - phonopy =2.15.1 - pint =0.19.2 -- pyiron_base =0.5.19 +- pyiron_base =0.5.20 - pymatgen =2022.7.25 - pyscal =2.10.15 - pytables =3.7.0 From 7df47ecd72b98dec6ed3baf52438556443b0355a Mon Sep 17 00:00:00 2001 From: Niklas Siemer <70580458+niklassiemer@users.noreply.github.com> Date: Wed, 3 Aug 2022 12:33:30 +0200 Subject: [PATCH 2/3] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fcb32466c..a1c314a82 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ 'pandas==1.4.3', 'phonopy==2.15.1', 'pint==0.19.2', - 'pyiron_base==0.5.19', + 'pyiron_base==0.5.20', 'pymatgen==2022.7.25', 'scipy==1.9.0', 'seekpath==2.0.1', From 9dccdd51911b3f6306ec7b40f4b3b85c69ba6c75 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Wed, 3 Aug 2022 08:31:50 -0600 Subject: [PATCH 3/3] Update gamma_surface_parallel_master.ipynb --- notebooks/gamma_surface_parallel_master.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notebooks/gamma_surface_parallel_master.ipynb b/notebooks/gamma_surface_parallel_master.ipynb index e45afebdc..7cb61587b 100644 --- a/notebooks/gamma_surface_parallel_master.ipynb +++ b/notebooks/gamma_surface_parallel_master.ipynb @@ -57,7 +57,7 @@ "outputs": [], "source": [ "from pyiron_atomistics.atomistics.master.parallel import AtomisticParallelMaster\n", - "from pyiron_base.master.parallel import JobGenerator" + "from pyiron_base import JobGenerator" ] }, { @@ -306,4 +306,4 @@ }, "nbformat": 4, "nbformat_minor": 4 -} \ No newline at end of file +}