Skip to content

Commit

Permalink
Merge d8785c9 into 6863fc9
Browse files Browse the repository at this point in the history
  • Loading branch information
badabump-release-bot[bot] committed Oct 25, 2022
2 parents 6863fc9 + d8785c9 commit 94a3813
Show file tree
Hide file tree
Showing 8 changed files with 217 additions and 208 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ trim_trailing_whitespace = true
[{.babelrc,.compressrc,.eslintrc,.linguirc}]
indent_size = 2

[*.{css,cfg,html,ini,js,json,md,service,toml,yaml,yml,xml}]
[*.{css,cfg,html,html.j2,ini,js,json,md,service,service.j2,toml,yaml,yml,xml}]
indent_size = 2

[*.{elm,nginx,py,rst,sh}]
[*.{nginx,nginx.j2,py,rst,sh}]
indent_size = 4

[*Makefile*]
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
pull_request:
branches: ["main"]

concurrency:
group: "${{ github.workflow }}-${{ github.head_ref || github.run_id }}"
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"

Expand All @@ -25,7 +29,7 @@ jobs:
runs-on: "${{ matrix.os }}"

steps:
- uses: "actions/checkout@v3.0.2"
- uses: "actions/checkout@v3.1.0"

- id: "python_and_poetry"
uses: "./.github/actions/install_python_and_poetry"
Expand All @@ -45,17 +49,17 @@ jobs:
test:
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-rc - 3.11"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
include:
- python-version: "3.10"
- python-version: "3.11"
dev: "true"

name: "Python ${{ matrix.python-version }}"

runs-on: "ubuntu-latest"

steps:
- uses: "actions/checkout@v3.0.2"
- uses: "actions/checkout@v3.1.0"

- id: "python_and_poetry"
uses: "./.github/actions/install_python_and_poetry"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_package.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Build & Deploy Package"
name: "(Reusable) Build & Deploy Package"

on:
workflow_call:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_verify_docs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ defaults:
run:
shell: "bash"

name: "Verify Docs Build Well"
name: "(Reusable) Verify Docs Build Well"

on:
workflow_call:
Expand Down
15 changes: 8 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default_language_version:
python: &python_version "python3.10"
python: &python_version "python3.11"
exclude: ^(archive|assets|migrations)/.*|.*/(migrations|test-data|vendor)/.*|.*\.svg$
minimum_pre_commit_version: "1.17.0"
repos:
Expand All @@ -12,6 +12,12 @@ repos:
language_version: *python_version
stages: ["commit-msg"]

- repo: "https://github.com/Kludex/no-optional"
rev: "0.4.0"
hooks:
- id: "no_optional"
name: "Format code (no-optional)"

- repo: "https://github.com/PyCQA/isort"
rev: "5.10.1"
hooks:
Expand Down Expand Up @@ -89,11 +95,6 @@ repos:
additional_dependencies: *flake8_additional_dependencies
exclude: ^docs/.*$

- repo: "https://github.com/Kludex/no-optional"
rev: "0.4.0"
hooks:
- id: "no_optional"

- repo: "local"
hooks:
- id: "mypy"
Expand All @@ -102,7 +103,7 @@ repos:
language: "python"
"types": ["python"]
require_serial: true
exclude: ^(docs|migrations|tests)/.*$
exclude: ^(.*/)?(docs|migrations|tests)/.*$

- repo: "https://github.com/shellcheck-py/shellcheck-py"
rev: "v0.8.0.4"
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10.8
3.11.0
Loading

0 comments on commit 94a3813

Please sign in to comment.