Skip to content

Commit

Permalink
Merge pull request #144 from JuDFTteam/develop
Browse files Browse the repository at this point in the history
Release v2.1.0
  • Loading branch information
PhilippRue authored Nov 10, 2023
2 parents f0b07af + 2e705df commit 843b408
Show file tree
Hide file tree
Showing 68 changed files with 1,496 additions and 869 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.0.1
current_version = 2.1.0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]
aiida: [{version: 'aiida-core==2.1.2', name: '2.1.2'}]
aiida: [{version: 'aiida-core==2.3.0', name: '2.3.0'}]
masci-tools: [{version: 'git+https://github.com/JuDFTteam/masci-tools.git@develop', name: '-masci-develop'}]
allowed-to-fail: [false]

Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -181,12 +181,12 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Build package
- name: Install flit
run: |
pip install wheel
python setup.py sdist bdist_wheel
- name: Publish to PyPi
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_KEY }}
pip install flit~=3.4
- name: Build and publish to PyPi
run: |
flit publish
env:
FLIT_USERNAME: __token__
FLIT_PASSWORD: ${{ secrets.PYPI_KEY }}
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]
aiida: [{version: 'aiida-core==2.1.2', name: '2.1.2'}]
aiida: [{version: 'aiida-core==2.3.0', name: '2.3.0'}]
masci-tools: [{version: 'git+https://github.com/JuDFTteam/masci-tools.git@develop', name: '-masci-develop'}]
allowed-to-fail: [false]

Expand Down Expand Up @@ -183,5 +183,6 @@ jobs:
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./tests/coverage.xml
fail_ci_if_error: true
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -18,7 +18,7 @@ repos:
- id: forbid-new-submodules

- repo: https://github.com/google/yapf
rev: v0.32.0
rev: v0.40.2
hooks:
- id: yapf
name: yapf
Expand All @@ -27,7 +27,7 @@ repos:
additional_dependencies: [toml]

- repo: https://github.com/ikamensh/flynt/
rev: '0.78'
rev: '1.0.1'
hooks:
- id: flynt
args: [
Expand Down
File renamed without changes.
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.0.1'
__version__ = '2.1.0'
Loading

0 comments on commit 843b408

Please sign in to comment.