From 4d644bf175990c160a699f1105153c602b244176 Mon Sep 17 00:00:00 2001
From: Kristjan Eimre <eimrek@users.noreply.github.com>
Date: Tue, 7 Nov 2023 17:23:53 +0200
Subject: [PATCH] Update aiida 2.0->2.4 (#33)

* aiida to v2.3

* force install graphviz 0.13.2

* cap numpy version

* fix psql_dos entry point

* aiida v2.4

* python 3.9 and pandas 1.1
---
 Dockerfile                  | 6 +++++-
 pipeline_config/__init__.py | 2 +-
 setup.py                    | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ffd1443..687cb10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.9
 
 # Install recent nodejs for bokeh & jsmol-bokeh-extension
 # See https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
@@ -44,6 +44,10 @@ RUN ln -s /app/jmol-14.29.22/jsmol ./detail/static/jsmol
 RUN ln -s /app/jmol-14.29.22/jsmol ./details/static/jsmol
 COPY setup.py ./
 RUN pip install -e .
+# NOTE This container requires graphviz~=0.13.2 that conflicts with aiida-core
+# Just force-install this version and hope nothing breaks...
+RUN pip install graphviz~=0.13.2
+
 COPY serve-app.sh /opt/
 
 # start bokeh server
diff --git a/pipeline_config/__init__.py b/pipeline_config/__init__.py
index f1f018b..fb72ce2 100644
--- a/pipeline_config/__init__.py
+++ b/pipeline_config/__init__.py
@@ -31,7 +31,7 @@ def update_config():
             profile_name, {
                 "default_user_email": os.getenv("default_user_email"),
                 "storage": {
-                    "backend": "psql_dos",
+                    "backend": "core.psql_dos",
                     "config": {
                         "database_engine": os.getenv("AIIDADB_ENGINE"),
                         "database_hostname": os.getenv("AIIDADB_HOST"),
diff --git a/setup.py b/setup.py
index 9bc8036..187c023 100644
--- a/setup.py
+++ b/setup.py
@@ -13,16 +13,16 @@
           classifiers=["Programming Language :: Python"],
           version="1.0.0",
           install_requires=[
-              "aiida-core~=2.0",
+              "aiida-core~=2.4",
               "bokeh~=1.4.0",
               "jsmol-bokeh-extension~=0.2.1",
               "requests~=2.21.0",
               "panel~=0.8.1",
               "param~=1.9.3",
-              "graphviz~=0.13.2",
-              "pandas~=1.0.5",
+              "pandas~=1.1.0",
               "pyjanitor~=0.20.2",
               "jinja2~=3.0.0",
               "frozendict~=2.3.2",
+              "numpy~=1.23.1",
           ],
           extras_require={"pre-commit": ["pre-commit==1.17.0", "prospector==1.2.0", "pylint==2.4.0"]})