Skip to content

Commit

Permalink
Merge pull request #64 from yakutovicha/release_1.1.1
Browse files Browse the repository at this point in the history
Release 1.1.1
  • Loading branch information
yakutovicha committed Apr 16, 2020
2 parents f582f88 + 670b23a commit aac04be
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
parallel=True
13 changes: 0 additions & 13 deletions .docker/opt/add-codes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,5 @@ set -x
# Environment
export SHELL=/bin/bash

# Activate conda.
__conda_setup="$('/opt/conda/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/opt/conda/etc/profile.d/conda.sh" ]; then
. "/opt/conda/etc/profile.d/conda.sh"
else
export PATH="/opt/conda/bin:$PATH"
fi
fi
unset __conda_setup

# Install raspa code.
verdi code show raspa@localhost || verdi code setup --config /opt/aiida-raspa/.docker/raspa-code.yml --non-interactive
2 changes: 1 addition & 1 deletion aiida_raspa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
##############################################################################
"""AiiDA-RASPA plugins, parsers, workflows, etc ..."""

__version__ = "1.1.0"
__version__ = "1.1.1"
8 changes: 7 additions & 1 deletion aiida_raspa/calculations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@ def define(cls, spec):
valid_type=FolderData,
required=False,
help='To use an old calculation as a starting poing for a new one.')
spec.input('metadata.options.parser_name', valid_type=str, default=cls.DEFAULT_PARSER, non_db=True)
spec.inputs['metadata']['options']['parser_name'].default = cls.DEFAULT_PARSER
spec.inputs['metadata']['options']['resources'].default = {
'num_machines': 1,
'num_mpiprocs_per_machine': 1,
'num_cores_per_mpiproc': 1,
}
spec.inputs['metadata']['options']['withmpi'].default = False

# Output parameters
spec.output('output_parameters', valid_type=Dict, required=True, help="The results of a calculation")
Expand Down
8 changes: 4 additions & 4 deletions setup.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "aiida-raspa",
"version": "1.1.0",
"version": "1.1.1",
"author": "Aliaksandr Yakutovich",
"author_email": "aliaksandr.yakutovich@epfl.ch",
"description": "AiiDA plugin for RASPA code",
"url": "https://github.com/yakutovicha/aiida-raspa",
"license": "MIT License",
"classifiers": [
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3",
"Framework :: AiiDA",
"Development Status :: 5 - Production/Stable"
],
"setup_requires": ["reentry"],
"reentry_register": true,
"install_requires": [
"aiida-core>=1.0.0,<2.0.0"
"aiida-core>=1.0.0,<2.0.0",
"pycifrw"
],
"entry_points": {
"aiida.calculations": [
Expand Down

0 comments on commit aac04be

Please sign in to comment.