Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippRue committed Dec 5, 2024
2 parents 966be65 + cc13a48 commit b0ce671
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.3.0-dev3
current_version = 2.3.1
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ jobs:
- name: Install aiida-kkr
run: |
pip install ${{ matrix.aiida.version }} ${{ matrix.masci-tools.version }}
pip install git+https://github.com/PhilippRue/aiida-test-cache.git@change_aiida-core_version
pip install .[testing]
pip install reentry
reentry scan
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ jobs:
- name: Install aiida-kkr
run: |
pip install ${{ matrix.aiida.version }} ${{ matrix.masci-tools.version }}
pip install git+https://github.com/PhilippRue/aiida-test-cache.git@change_aiida-core_version
pip install .[testing]
pip install reentry
reentry scan
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:
- id: forbid-new-submodules

- repo: https://github.com/google/yapf
rev: v0.40.2
rev: v0.43.0
hooks:
- id: yapf
name: yapf
Expand Down
2 changes: 1 addition & 1 deletion aiida_kkr/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
AiiDA KKR
"""

__version__ = '2.3.0-dev3'
__version__ = '2.3.1'
4 changes: 3 additions & 1 deletion aiida_kkr/cmdline/visualization/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
from aiida.cmdline.params import arguments


@click.command(name='plot',)
@click.command(
name='plot',
)
@click.option('-f', 'filename', type=click.File('r'), default=None)
@click.option(
'-o',
Expand Down
13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "aiida-kkr"
version = "2.3.0-dev3"
version = "2.3.1"
description = "AiiDA plugin for the JuKKR codes"
classifiers = [
"License :: OSI Approved :: MIT License",
Expand Down Expand Up @@ -59,10 +59,10 @@ Documentation = "https://aiida-kkr.readthedocs.io"

[project.optional-dependencies]
pre-commit = [
"pre-commit==4.0.1",
"yapf==0.43.0",
"pylint==1.9.4; python_version<'3.0'",
"pylint==3.3.1; python_version>='3.0'",
"pre-commit >= 4.0.1",
"yapf >= 0.43.0",
"pylint == 1.9.4; python_version < '3.0'",
"pylint >= 3.3.1; python_version >= '3.0'",
]
testing = [
"pgtest >= 1.3.0",
Expand All @@ -71,7 +71,8 @@ testing = [
"pytest-mpl >= 0.10",
"pytest-timeout >= 1.3.3",
"pytest-regressions >= 1.0",
"MarkupSafe < 3.1.0"
"MarkupSafe < 3.1.0",
"aiida-test-cache"
]
docs = [
"Sphinx >= 1.8.2",
Expand Down

0 comments on commit b0ce671

Please sign in to comment.