Skip to content

Commit

Permalink
Update aiida 2.0->2.4 (#33)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
eimrek authored Nov 7, 2023
1 parent 8fc9a33 commit 4d644bf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pipeline_config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]})

0 comments on commit 4d644bf

Please sign in to comment.