Devops: Address various deprecation warnings from aiida-core

aiidateam · Nov 20, 2023 · ce3c99d · ce3c99d
1 parent 1e008d7
commit ce3c99d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/aiida_quantumespresso/workflows/xps.py b/src/aiida_quantumespresso/workflows/xps.py
@@ -21,7 +21,7 @@
 PwCalculation = CalculationFactory('quantumespresso.pw')
 PwBaseWorkChain = WorkflowFactory('quantumespresso.pw.base')
 PwRelaxWorkChain = WorkflowFactory('quantumespresso.pw.relax')
-XyData = DataFactory('array.xy')
+XyData = DataFactory('core.array.xy')
 
 
 def validate_inputs(inputs, _):

diff --git a/src/aiida_quantumespresso/workflows/xspectra/crystal.py b/src/aiida_quantumespresso/workflows/xspectra/crystal.py
@@ -19,7 +19,7 @@
 PwRelaxWorkChain = WorkflowFactory('quantumespresso.pw.relax')
 XspectraBaseWorkChain = WorkflowFactory('quantumespresso.xspectra.base')
 XspectraCoreWorkChain = WorkflowFactory('quantumespresso.xspectra.core')
-XyData = DataFactory('array.xy')
+XyData = DataFactory('core.array.xy')
 
 
 class XspectraCrystalWorkChain(ProtocolMixin, WorkChain):

diff --git a/tests/parsers/test_neb.py b/tests/parsers/test_neb.py
@@ -57,7 +57,7 @@ def test_neb_default(fixture_localhost, generate_calc_job_node, generate_parser,
 
     assert calcfunction.is_finished, calcfunction.exception
     assert calcfunction.is_finished_ok, calcfunction.exit_message
-    assert not [log for log in orm.Log.objects.get_logs_for(node) if log.levelname == 'ERROR']
+    assert not [log for log in orm.Log.collection.get_logs_for(node) if log.levelname == 'ERROR']
     assert 'output_parameters' in results
     assert 'output_mep' in results
     assert 'output_trajectory' in results
@@ -89,7 +89,7 @@ def test_neb_all_iterations(
 
     assert calcfunction.is_finished, calcfunction.exception
     assert calcfunction.is_finished_ok, calcfunction.exit_message
-    assert not [log for log in orm.Log.objects.get_logs_for(node) if log.levelname == 'ERROR']
+    assert not [log for log in orm.Log.collection.get_logs_for(node) if log.levelname == 'ERROR']
     assert 'output_parameters' in results
     assert 'output_mep' in results
     assert 'output_trajectory' in results

diff --git a/tests/parsers/test_open_grid.py b/tests/parsers/test_open_grid.py
@@ -20,8 +20,8 @@ def test_open_grid_default(fixture_localhost, generate_calc_job_node, generate_p
 
     data_regression.check({
         'output_parameters': results['output_parameters'].get_dict(),
-        'kpoints_mesh': results['kpoints_mesh'].attributes,
-        'kpoints': results['kpoints'].attributes,
+        'kpoints_mesh': results['kpoints_mesh'].base.attributes.all,
+        'kpoints': results['kpoints'].base.attributes.all,
     })
 
     num_regression.check({

diff --git a/tests/parsers/test_ph.py b/tests/parsers/test_ph.py
@@ -22,7 +22,7 @@ def test_ph_default(test_name, fixture_localhost, generate_calc_job_node, genera
 
     assert calcfunction.is_finished, calcfunction.exception
     assert calcfunction.is_finished_ok, calcfunction.exit_message
-    assert not [log for log in orm.Log.objects.get_logs_for(node) if log.levelname == 'ERROR']
+    assert not [log for log in orm.Log.collection.get_logs_for(node) if log.levelname == 'ERROR']
     assert 'output_parameters' in results
     data_regression.check(results['output_parameters'].get_dict())