Skip to content

Commit

Permalink
Fix minimal aiida-core version to 1.3.0 (aiida-cusp#5)
Browse files Browse the repository at this point in the history
* Fix minimal aiida-core version to 1.3.0

Minimal aiida-core version has to be fixed due to the recently
introduced change in the aiida-core package moving the resources
validation to the scheduler plugin.

see aiidateam/aiida-core#4192

* Fix python version to 3.7.7 in tests

PyYAML causes issues only for tests running on python 3.7.
A suggested change to fix this issue is fixing the python 3.7
version to the 3.7.7 minor release since test start to fail
only for 3.7.8

see: actions/runner-images#1202
  • Loading branch information
astamminger committed Mar 9, 2022
1 parent 0b49190 commit c0a36a6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ['3.7.7', '3.8', '3.9', '3.10']
services:
postgres:
image: postgres:10
Expand Down Expand Up @@ -78,4 +78,4 @@ jobs:
- name: Test package using pytest
run: |
pytest
pytest tests
2 changes: 0 additions & 2 deletions aiida_cusp/calculators/calculation_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ def vasp_calc_mpi_args(self):
scheduler = computer.get_scheduler()
resources = self.inputs.metadata.options.resources
default_cpus_machine = computer.get_default_mpiprocs_per_machine()
if default_cpus_machine is not None:
resources['default_mpiprocs_per_machine'] = default_cpus_machine
job_resource = scheduler.create_job_resource(**resources)
tot_num_mpiprocs = job_resource.get_tot_num_mpiprocs()
mpi_arg_dict = {'tot_num_mpiprocs': tot_num_mpiprocs}
Expand Down
2 changes: 1 addition & 1 deletion setup.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
]
},
"install_requires": [
"aiida-core>=1.2.1,<2.0.0",
"aiida-core>=1.3.0,<2.0.0",
"custodian",
"pymatgen>=2022.0.0",
"ase"
Expand Down

0 comments on commit c0a36a6

Please sign in to comment.