Skip to content

Commit e37869d

Browse files
authored
⬆️ UPDATE: aiida-core v2.0.1 (#75)
1 parent 92572a8 commit e37869d

20 files changed

+136
-159
lines changed

.ansible-lint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ warn_list:
55
- '208' # File permissions unset or incorrect
66
- '305' # Use shell only when shell functionality is required
77
- '503' # Tasks that run when changed should likely be handlers
8+
# new warning categories
9+
- experimental # all rules tagged as experimental
10+
- fqcn-builtins # Use FQCN for builtin actions.
11+
- ignore-errors # Use failed_when and specify error conditions instead of using ignore_errors.
12+
- no-changed-when # Commands should not change things if nothing needs doing.
13+
- schema # Perform JSON Schema Validation for known lintable kinds.
14+
- unnamed-task # All tasks should be named.
15+
- var-spacing # Jinja2 variables and filters should have spaces before and after.
16+
- yaml # Violations reported by yamllint.

.github/workflows/ci-debian.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727

2828
strategy:
2929
matrix:
30-
distro: [ubuntu1604, ubuntu1804, ubuntu2004]
31-
python_version: ["3.7"]
30+
distro: [ubuntu1804, ubuntu2004]
31+
python_version: ["3.8"]
3232
fail-fast: false
3333

3434
runs-on: ubuntu-latest

.github/workflows/ci-redhat.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
.galaxy_install_info
44
.vscode/
55
.tox/
6+
__pycache__/

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
repos:
44

55
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
6-
rev: v1.5.0
6+
rev: v2.3.0
77
hooks:
88
- id: pretty-format-yaml
99
args: [--autofix, --indent, "2", --preserve-quotes]
1010

1111
- repo: https://github.com/adrienverge/yamllint
12-
rev: v1.25.0
12+
rev: v1.26.3
1313
hooks:
1414
- id: yamllint
1515

1616
- repo: https://github.com/ansible/ansible-lint
17-
rev: v4.3.5
17+
rev: v6.3.0
1818
hooks:
1919
- id: ansible-lint

defaults/main.yml

Lines changed: 71 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
aiida_python_version: "3.7"
2-
aiida_version: "1.6.1"
1+
aiida_python_version: "3.8"
2+
aiida_version: "2.0.1"
33
aiida_tag: v{{ aiida_version }}
44
aiida_extras:
55
- rest
@@ -18,10 +18,14 @@ aiida_jupyter_venv: "{{ aiida_venv_base }}/jupyter"
1818
aiida_venv_constraints: "{{ aiida_data_folder }}/constraints.txt"
1919
# these are packages required to run the install
2020
aiida_install_packages:
21-
- pip~=21.1
21+
- pip~=22.1
22+
- flit
2223
- wheel
2324
- ipykernel # required to add the venv as a kernel
2425
aiida_extra_packages: []
26+
# # pymatgen frequently breaks builds; one reason being that it is compiled against numpy,
27+
# # and so if numpy changes
28+
# aiida_numpy_version: 1.20.2
2529
aiida_jupyter_packages:
2630
- jupyter~=1.0.0
2731
- jupyterlab~=2.2.9
@@ -34,7 +38,7 @@ aiida_profile_institution: Quantum Mobile
3438
aiida_profile_email: aiida@localhost
3539

3640
# database backend
37-
aiida_database_backend: django
41+
aiida_database_backend: psql_dos
3842

3943
# postgres
4044
aiida_postgres_host: localhost
@@ -57,8 +61,8 @@ aiida_rabbitmq_repository_path: "/etc/yum.repos.d/rabbitmq_rabbitmq-server.repo"
5761
# computer
5862
aiida_computer_name: localhost
5963
aiida_computer_cpus: 2
60-
aiida_computer_scheduler: direct
61-
aiida_computer_transport: local
64+
aiida_computer_scheduler: core.direct
65+
aiida_computer_transport: core.local
6266
aiida_computer_run_folder: "${HOME}/.aiida_run"
6367
aiida_computer_mpirun_command: "mpirun -np {tot_num_mpiprocs}"
6468

@@ -74,72 +78,75 @@ aiida_computer_mpirun_command: "mpirun -np {tot_num_mpiprocs}"
7478

7579
# the plugin label will be of the format: `{{ code_prefix }}-{{ version }}-{{ code_item.name }}`
7680

77-
aiida_plugins:
78-
aiida-abinit:
79-
version: "0.2.0a1"
80-
code_prefix: abinit
81-
codes_var: "abinit_executables"
82-
aiida-bigdft:
83-
version: "0.2.6"
84-
code_prefix: bigdft
85-
codes_var: "bigdft_executables"
86-
aiida-cp2k:
87-
version: "1.3.0"
88-
code_prefix: cp2k
89-
codes_var: "cp2k_executables"
90-
aiida-fleur:
91-
version: "1.1.4"
92-
code_prefix: fleur
93-
codes_var: "fleur_executables"
94-
aiida-nwchem:
95-
version: "2.0.0"
96-
code_prefix: nwchem
97-
codes_var: "nwchem_executables"
98-
aiida-quantumespresso:
99-
version: "3.4.1"
100-
code_prefix: qe
101-
codes_var: "quantum_espresso_executables"
102-
omit_plugins: ["quantumespresso.hp", "wannier90"]
103-
aiida-siesta:
104-
version: "1.1.0"
105-
code_prefix: siesta
106-
codes_var: "siesta_executables"
107-
aiida-wannier90:
108-
version: "2.0.1"
109-
code_prefix: wannier90
110-
codes_var: "wannier90_executables"
111-
aiida-wannier90_workflows:
112-
version: "1.0.1"
113-
aiida-yambo:
114-
version: "1.1.3"
115-
code_prefix: yambo
116-
codes_var: "yambo_executables"
117-
118-
# common-workflow only (simulation codes are not open-source)
119-
aiida-orca:
120-
version: "0.5.1"
121-
aiida-castep:
122-
version: "1.2.0a5"
123-
aiida-gaussian:
124-
version: "1.3.0"
125-
aiida-vasp:
126-
version: "2.1.0"
127-
aiida-common-workflows:
128-
version: "0.1.0"
81+
aiida_plugins: {}
82+
83+
# TODO update plugins to aiida-core v2
84+
85+
# aiida-abinit:
86+
# version: "0.2.0a1"
87+
# code_prefix: abinit
88+
# codes_var: "abinit_executables"
89+
# aiida-bigdft:
90+
# version: "0.2.6"
91+
# code_prefix: bigdft
92+
# codes_var: "bigdft_executables"
93+
# aiida-cp2k:
94+
# version: "1.3.0"
95+
# code_prefix: cp2k
96+
# codes_var: "cp2k_executables"
97+
# aiida-fleur:
98+
# version: "1.1.4"
99+
# code_prefix: fleur
100+
# codes_var: "fleur_executables"
101+
# aiida-nwchem:
102+
# version: "2.0.0"
103+
# code_prefix: nwchem
104+
# codes_var: "nwchem_executables"
105+
# aiida-quantumespresso:
106+
# version: "3.4.1"
107+
# code_prefix: qe
108+
# codes_var: "quantum_espresso_executables"
109+
# omit_plugins: ["quantumespresso.hp", "wannier90"]
110+
# aiida-siesta:
111+
# version: "1.1.0"
112+
# code_prefix: siesta
113+
# codes_var: "siesta_executables"
114+
# aiida-wannier90:
115+
# version: "2.0.1"
116+
# code_prefix: wannier90
117+
# codes_var: "wannier90_executables"
118+
# aiida-wannier90_workflows:
119+
# version: "1.0.1"
120+
# aiida-yambo:
121+
# version: "1.1.3"
122+
# code_prefix: yambo
123+
# codes_var: "yambo_executables"
124+
125+
# # common-workflow only (simulation codes are not open-source)
126+
# aiida-orca:
127+
# version: "0.5.1"
128+
# aiida-castep:
129+
# version: "1.2.0a5"
130+
# aiida-gaussian:
131+
# version: "1.3.0"
132+
# aiida-vasp:
133+
# version: "2.1.0"
134+
# aiida-common-workflows:
135+
# version: "0.1.0"
129136

130137
# pseudos
131138
aiida_pseudopotentials:
132-
- name: SSSP_1.1_efficiency
139+
- name: SSSP_1.1.1_PBE_efficiency
133140
file: SSSP_efficiency_pseudos.aiida
134-
url: https://archive.materialscloud.org/record/file?record_id=22&file_id=ea53f742-5f57-40b9-854b-9c34dc2bdbb3&filename=SSSP_efficiency_pseudos.aiida
135-
home_page: https://materialscloud.org/sssp/
141+
url: https://archive.materialscloud.org/record/file?filename=SSSP_1.1.1_PBE_efficiency.aiida&record_id=824
142+
home_page: https://archive.materialscloud.org/record/2021.64
136143
description: >-
137144
Standard Solid State Pseudopotentials (efficiency)
138145
for the PBE functional
139-
- name: SSSP_1.1_precision
146+
- name: SSSP_1.1.1_PBE_precision
140147
file: SSSP_precision_pseudos.aiida
141-
url: https://archive.materialscloud.org/record/file?record_id=22&file_id=a5278c7d-356e-40a7-8ca0-a7eaf0b63a9d&filename=SSSP_precision_pseudos.aiida
142-
home_page: https://materialscloud.org/sssp/
148+
url: https://archive.materialscloud.org/record/file?filename=SSSP_1.1.1_PBE_precision.aiida&record_id=824
149+
home_page: https://archive.materialscloud.org/record/2021.64
143150
description: >-
144151
Standard Solid State Pseudopotentials (precision)
145152
for the PBE functional
@@ -163,7 +170,6 @@ aiida_jupyter_port: 8890
163170
# symlink executubles from the aiida environment into the jupyter one
164171
aiida_jupyter_symlink:
165172
- verdi
166-
- reentry
167173

168174
root_user: root
169175
# add vm_headless=false to add a destop shortcut to start jupyter lab

filter_plugins/toml.py

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Make coding more python3-ish
2+
from __future__ import (absolute_import, division, print_function)
3+
__metaclass__ = type
4+
5+
try:
6+
import tomli
7+
HAS_TOMLI = True
8+
except ImportError:
9+
HAS_TOMLI = False
10+
11+
from ansible.errors import AnsibleFilterError
12+
from ansible.module_utils._text import to_text
13+
from ansible.module_utils.common._collections_compat import MutableMapping
14+
from ansible.module_utils.six import string_types
15+
16+
17+
def from_toml(o):
18+
if not HAS_TOMLI:
19+
raise AnsibleFilterError("The 'from_toml' filter plugin requires the python 'tomli' library'")
20+
if not isinstance(o, string_types):
21+
raise AnsibleFilterError('from_toml requires a string, got %s' % type(o))
22+
return tomli.loads(to_text(o, errors='surrogate_or_strict'))
23+
24+
25+
class FilterModule(object):
26+
def filters(self):
27+
return {
28+
'from_toml': from_toml
29+
}

handlers/main.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

molecule/default/converge.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
vars:
2424
# just to test whether this also works
2525
aiida_data_folder: "/usr/local/share"
26+
aiida_plugins:
27+
aiida-quantumespresso-test:
28+
version: "4.0.0a1"
29+
code_prefix: qe
30+
codes_var: "quantum_espresso_executables"
31+
omit_plugins: ["quantumespresso.hp", "wannier90"]
2632
quantum_espresso_version: "6.5"
2733
quantum_espresso_executables:
2834
- name: pw

molecule/default/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ provisioner:
3232
all:
3333
vars:
3434
ansible_python_interpreter: /usr/bin/python3
35-
aiida_python_version: "${MOLECULE_PYTHON_VERSION:-3.7}"
35+
aiida_python_version: "${MOLECULE_PYTHON_VERSION:-3.8}"
3636
install_node: "${MOLECULE_INSTALL_NODE:-no}"
3737
# for testing in docker container
3838
jupyter_ip: "0.0.0.0"

0 commit comments

Comments
 (0)