Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to AiiDA v1.6.4 and remove CI fix #857

Merged
merged 2 commits into from
Jun 24, 2021
Merged

Update to AiiDA v1.6.4 and remove CI fix #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2957b2b
Update to AiiDA v1.6.4 and remove CI fix
CasperWA Jun 23, 2021
4964943
Fix test utility function for version retrieval
CasperWA Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/deps_lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,6 @@ jobs:
- name: Install adapter conversion dependencies
run: |
pip install -r requirements-client.txt
# See PR aiidateam/aiida-core#4989 for this temporary fix.
# It should be removed as soon as `aiida-core`>1.6.3 is released.
pip install psycopg2-binary~=2.8.3
# AiiDA-specific
reentry scan

Expand Down
2 changes: 1 addition & 1 deletion requirements-client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aiida-core==1.6.3
aiida-core==1.6.4
ase==3.21.1
numpy==1.20.3
pymatgen==2021.3.9
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
] + mongo_deps

# Client minded
aiida_deps = ["aiida-core~=1.6"]
aiida_deps = ["aiida-core~=1.6,>=1.6.4"]
ase_deps = ["ase~=3.21"]
cif_deps = ["numpy~=1.20"]
pdb_deps = cif_deps
Expand Down
2 changes: 1 addition & 1 deletion tests/adapters/structures/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ def get_min_ver(dependency: str) -> str:
for line in setup_file.readlines():
min_ver = re.findall(fr'"{dependency}((=|!|<|>|~)=|>|<)(.+)"', line)
if min_ver:
return min_ver[0][2].split(";")[0]
return min_ver[0][2].split(";")[0].split(",")[0]
else:
raise RuntimeError(f"Cannot find {dependency} dependency in setup.py")