Skip to content

Commit

Permalink
Dependencies: Update requirement aiida-core~=2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sphuber committed Dec 22, 2023
1 parent ace8c56 commit 137f5fd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
run: sudo apt update && sudo apt install postgresql

- name: Install Python dependencies
run: pip install -e .[dev] && reentry scan
run: pip install -e .[dev]

- name: Run pytest
run: pytest -sv tests
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ jobs:
run: sudo apt update && sudo apt install postgresql

- name: Install Python package and dependencies
run: pip install -e .[dev] && reentry scan
run: pip install -e .[dev]

- name: Run pytest
env:
AIIDA_WARN_v3: true
run: pytest -sv tests
7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ classifiers = [
keywords = ['aiida', 'workflows']
requires-python = '>=3.8'
dependencies = [
'aiida_core[atomic_tools]~=1.6',
'aiida_core[atomic_tools]~=2.0',
'fuzzywuzzy~=0.18.0',
]

Expand All @@ -46,3 +46,8 @@ profile = "black"
line-length = 100
target-version = ['py38']
include = '\.pyi?$'

[tool.pytest.ini_options]
filterwarnings = [
'ignore:Creating AiiDA configuration folder.*:UserWarning'
]
6 changes: 4 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,17 @@ def factory(
if inputs:
for link_label, input_node in flatten_inputs(inputs):
input_node.store()
node.add_incoming(input_node, link_type=LinkType.INPUT_CALC, link_label=link_label)
node.base.links.add_incoming(
input_node, link_type=LinkType.INPUT_CALC, link_label=link_label
)

node.store()

filepath_retrieved = filepath_tests / "parsers" / "fixtures" / directory / test_name

retrieved = FolderData()
retrieved.put_object_from_tree(filepath_retrieved)
retrieved.add_incoming(node, link_type=LinkType.CREATE, link_label="retrieved")
retrieved.base.links.add_incoming(node, link_type=LinkType.CREATE, link_label="retrieved")
retrieved.store()

if retrieve_temporary_list:
Expand Down

0 comments on commit 137f5fd

Please sign in to comment.