Skip to content

Commit

Permalink
Merge branch 'main' into python-3.10.11
Browse files Browse the repository at this point in the history
danielhollas authored Oct 24, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents f77b56a + a2d73d5 commit 7eb857e
Showing 5 changed files with 15 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ ci:
repos:

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-json
- id: end-of-file-fixer
@@ -18,14 +18,14 @@ repos:
args: [--preserve-quotes]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.0
rev: v0.6.9
hooks:
- id: ruff-format
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --show-fixes]

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: "0.28.6"
rev: "0.29.3"
hooks:
- id: check-dependabot
- id: check-github-workflows
2 changes: 1 addition & 1 deletion bumpver.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpver]
current_version = "v2024.1022"
current_version = "v2024.1023"
version_pattern = "vYYYY.BUILD[-TAG]"
commit_message = "Bump version {old_version} -> {new_version}."
commit = true
3 changes: 2 additions & 1 deletion stack/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -10,7 +10,8 @@ USER root
# https://pymatgen.org/installation.html#installation-tips-for-optional-libraries
# rsync: needed to support the new AiiDA backup command
# povray: rendering engine used in aiidalab-widgets-base
ENV EXTRA_APT_PACKAGES "curl povray rsync build-essential"
# bc: needed to compute the resources for computer setup
ENV EXTRA_APT_PACKAGES "curl povray rsync build-essential bc"

# For ARM64 we need to install erlang as it is not available on conda-forge
# (this is needed later as rabbitmq dependency in base-with-services image,
3 changes: 0 additions & 3 deletions stack/base/before-notebook.d/40_prepare-aiida.sh
Original file line number Diff line number Diff line change
@@ -80,6 +80,3 @@ else
verdi storage migrate --force

fi

# Daemon will start only if the database exists and is migrated to the latest version.
verdi daemon start || echo "ERROR: AiiDA daemon is not running!"
9 changes: 9 additions & 0 deletions stack/base/before-notebook.d/90_start_aiida_daemon.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

# This script is executed whenever the docker container is (re)started.
set -x

export SHELL=/bin/bash

# Daemon will start only if the database exists and is migrated to the latest version.
verdi daemon start || echo "ERROR: AiiDA daemon is not running!"

0 comments on commit 7eb857e

Please sign in to comment.