Skip to content

Commit

Permalink
Pre-commit: Add formatters for TOML and YAML files
Browse files Browse the repository at this point in the history
  • Loading branch information
sphuber committed Dec 22, 2023
1 parent ff01083 commit 357fc45
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 188 deletions.
146 changes: 73 additions & 73 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,103 +1,103 @@
name: cd

on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+*

jobs:

validate-release-tag:
validate-release-tag:

if: github.repository == 'aiidateam/aiida-pseudo'
runs-on: ubuntu-latest
if: github.repository == 'aiidateam/aiida-pseudo'
runs-on: ubuntu-latest

steps:
- name: Checkout source
uses: actions/checkout@v2
steps:
- name: Checkout source
uses: actions/checkout@v2

- name: Install Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Install Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Validate the tag version against the package version
run: python .github/workflows/validate_release_tag.py $GITHUB_REF
- name: Validate the tag version against the package version
run: python .github/workflows/validate_release_tag.py $GITHUB_REF

pre-commit:
pre-commit:

needs: [validate-release-tag]
runs-on: ubuntu-latest
needs: [validate-release-tag]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
steps:
- uses: actions/checkout@v2

- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: 'pip'
cache-dependency-path: pyproject.toml
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: pip
cache-dependency-path: pyproject.toml

- name: Install Python package and dependencies
run: pip install -e .[pre-commit,tests]
- name: Install Python package and dependencies
run: pip install -e .[pre-commit,tests]

- name: Run pre-commit
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
- name: Run pre-commit
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )

tests:
tests:

needs: [validate-release-tag]
runs-on: ubuntu-latest
needs: [validate-release-tag]
runs-on: ubuntu-latest

strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']

services:
postgres:
image: postgres:12
rabbitmq:
image: rabbitmq:latest
ports:
- 5672:5672
services:
postgres:
image: postgres:12
rabbitmq:
image: rabbitmq:latest
ports:
- 5672:5672

steps:
- uses: actions/checkout@v2
steps:
- uses: actions/checkout@v2

- name: Install Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: pyproject.toml
- name: Install Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: pyproject.toml

- name: Install Python package and dependencies
run: pip install -e .[tests]
- name: Install Python package and dependencies
run: pip install -e .[tests]

- name: Run pytest
run: pytest -sv tests
- name: Run pytest
run: pytest -sv tests

publish:
publish:

name: Publish to PyPI
needs: [pre-commit, tests]
runs-on: ubuntu-latest
name: Publish to PyPI
needs: [pre-commit, tests]
runs-on: ubuntu-latest

steps:
- name: Checkout source
uses: actions/checkout@v2
steps:
- name: Checkout source
uses: actions/checkout@v2

- name: Install Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Install Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Install flit
run: pip install flit~=3.4
- name: Install flit
run: pip install flit~=3.4

- name: Build and publish
run: flit publish
env:
FLIT_USERNAME: __token__
FLIT_PASSWORD: ${{ secrets.PYPI_KEY }}
- name: Build and publish
run: flit publish
env:
FLIT_USERNAME: __token__
FLIT_PASSWORD: ${{ secrets.PYPI_KEY }}
82 changes: 41 additions & 41 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,57 @@ on: [push, pull_request]

jobs:

pre-commit:
pre-commit:

runs-on: ubuntu-latest
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
steps:
- uses: actions/checkout@v2

- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: 'pip'
cache-dependency-path: pyproject.toml
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: pip
cache-dependency-path: pyproject.toml

- name: Install Python package and dependencies
run: pip install -e .[pre-commit,tests]
- name: Install Python package and dependencies
run: pip install -e .[pre-commit,tests]

- name: Run pre-commit
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
- name: Run pre-commit
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )

tests:
tests:

runs-on: ubuntu-latest
timeout-minutes: 10
runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']

services:
postgres:
image: postgres:12
rabbitmq:
image: rabbitmq:latest
ports:
- 5672:5672
services:
postgres:
image: postgres:12
rabbitmq:
image: rabbitmq:latest
ports:
- 5672:5672

steps:
- uses: actions/checkout@v2
steps:
- uses: actions/checkout@v2

- name: Install Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: pyproject.toml
- name: Install Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: pip
cache-dependency-path: pyproject.toml

- name: Install Python package and dependencies
run: pip install -e .[tests]
- name: Install Python package and dependencies
run: pip install -e .[tests]

- name: Run pytest
env:
AIIDA_WARN_v3: True
run: pytest -sv tests
- name: Run pytest
env:
AIIDA_WARN_v3: true
run: pytest -sv tests
32 changes: 20 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.2.0'
hooks:
- id: double-quote-string-fixer
- id: end-of-file-fixer
- id: fix-encoding-pragma
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
hooks:
- id: double-quote-string-fixer
- id: end-of-file-fixer
- id: fix-encoding-pragma
- id: mixed-line-ending
- id: trailing-whitespace

- repo: https://github.com/ikamensh/flynt/
rev: '0.76'
hooks:
- id: flynt
- repo: https://github.com/ikamensh/flynt/
rev: '0.76'
hooks:
- id: flynt

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.9
Expand All @@ -24,3 +24,11 @@ repos:
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
exclude: *exclude_files

- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.11.0
hooks:
- id: pretty-format-toml
args: [--autofix]
- id: pretty-format-yaml
args: [--autofix]
20 changes: 10 additions & 10 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
version: 2

build:
os: ubuntu-22.04
tools:
python: '3.11'
os: ubuntu-22.04
tools:
python: '3.11'

python:
install:
- method: pip
path: .
extra_requirements:
- docs
install:
- method: pip
path: .
extra_requirements:
- docs

sphinx:
builder: html
fail_on_warning: true
builder: html
fail_on_warning: true
Loading

0 comments on commit 357fc45

Please sign in to comment.