From fe0162b0532411fc801638e0e87b531a820d0896 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:01:18 +0000 Subject: [PATCH 1/6] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/google/yapf: v0.40.2 → v0.43.0](https://github.com/google/yapf/compare/v0.40.2...v0.43.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3bd5b0ae..fe057211 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 From 4676716f3efed30927cdd013f4bbd3dad28532d0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:02:07 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- aiida_kkr/cmdline/visualization/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aiida_kkr/cmdline/visualization/__init__.py b/aiida_kkr/cmdline/visualization/__init__.py index 88ef02f8..9d01f646 100755 --- a/aiida_kkr/cmdline/visualization/__init__.py +++ b/aiida_kkr/cmdline/visualization/__init__.py @@ -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', From 98cb6c6755ff08baeef59e3cac96cabf66dec2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20R=C3=BC=C3=9Fmann?= <10085427+PhilippRue@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:56:14 +0000 Subject: [PATCH 3/6] Use first release of aiida-test-cache as testing dependency --- .bumpversion.cfg | 2 +- .github/workflows/cd.yml | 1 - .github/workflows/ci.yml | 1 - aiida_kkr/__init__.py | 2 +- pyproject.toml | 5 +++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b24fb942..4446e693 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.0-dev3 +current_version = 2.3.1-dev1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7dbef4ae..66524385 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12c7efe1..e4001327 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/aiida_kkr/__init__.py b/aiida_kkr/__init__.py index c14b03ef..4026d48f 100644 --- a/aiida_kkr/__init__.py +++ b/aiida_kkr/__init__.py @@ -2,4 +2,4 @@ AiiDA KKR """ -__version__ = '2.3.0-dev3' +__version__ = '2.3.1-dev1' diff --git a/pyproject.toml b/pyproject.toml index 5c16cb10..bfba5829 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "aiida-kkr" -version = "2.3.0-dev3" +version = "2.3.1-dev1" description = "AiiDA plugin for the JuKKR codes" classifiers = [ "License :: OSI Approved :: MIT License", @@ -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", From cd55f5a2fad77d37b47492d9dc9d904d0d738ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20R=C3=BC=C3=9Fmann?= <10085427+PhilippRue@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:02:23 +0000 Subject: [PATCH 4/6] relax pre-commit version dependencies --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bfba5829..5fb7dfc6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", From 9309e1b08eadd12a433f5228a71c4488d9a29964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20R=C3=BC=C3=9Fmann?= <10085427+PhilippRue@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:04:47 +0000 Subject: [PATCH 5/6] bump version to v2.3.1-dev2 --- .bumpversion.cfg | 2 +- aiida_kkr/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4446e693..7feb08f6 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.1-dev1 +current_version = 2.3.1-dev2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? diff --git a/aiida_kkr/__init__.py b/aiida_kkr/__init__.py index 4026d48f..ba517ee5 100644 --- a/aiida_kkr/__init__.py +++ b/aiida_kkr/__init__.py @@ -2,4 +2,4 @@ AiiDA KKR """ -__version__ = '2.3.1-dev1' +__version__ = '2.3.1-dev2' diff --git a/pyproject.toml b/pyproject.toml index 5fb7dfc6..751d80e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "aiida-kkr" -version = "2.3.1-dev1" +version = "2.3.1-dev2" description = "AiiDA plugin for the JuKKR codes" classifiers = [ "License :: OSI Approved :: MIT License", From cc13a48490d7ecc0c4582c2d911182efbd7d8a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20R=C3=BC=C3=9Fmann?= <10085427+PhilippRue@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:43:34 +0000 Subject: [PATCH 6/6] bump version number --- .bumpversion.cfg | 2 +- aiida_kkr/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7feb08f6..c42b6860 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.1-dev2 +current_version = 2.3.1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? diff --git a/aiida_kkr/__init__.py b/aiida_kkr/__init__.py index ba517ee5..7235612e 100644 --- a/aiida_kkr/__init__.py +++ b/aiida_kkr/__init__.py @@ -2,4 +2,4 @@ AiiDA KKR """ -__version__ = '2.3.1-dev2' +__version__ = '2.3.1' diff --git a/pyproject.toml b/pyproject.toml index 751d80e5..022b4bef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "aiida-kkr" -version = "2.3.1-dev2" +version = "2.3.1" description = "AiiDA plugin for the JuKKR codes" classifiers = [ "License :: OSI Approved :: MIT License",