Skip to content

Commit 30441d9

Browse files
matthewelwellmatthewelwell
committed
Merge branch 'refs/heads/main' into chore/add-sane-model-defaults
# Conflicts: # .github/workflows/pull-request.yml
2 parents 04b40cd + 6ff5a0a commit 30441d9

File tree

9 files changed

+1032
-119
lines changed

9 files changed

+1032
-119
lines changed

‎.github/workflows/conventional-commit.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Conventional Commit
2+
3+
on:
4+
pull_request:
5+
types:
6+
- edited
7+
- opened
8+
9+
jobs:
10+
conventional-commit:
11+
name: Conventional Commit
12+
runs-on: depot-ubuntu-latest
13+
steps:
14+
- name: Check PR Conventional Commit title
15+
uses: amannn/action-semantic-pull-request@v5
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
with:
19+
types: | # mirrors changelog-sections in the /release-please-config.json
20+
feat
21+
fix
22+
infra
23+
ci
24+
docs
25+
deps
26+
perf
27+
refactor
28+
test
29+
chore

‎.github/workflows/publish-pypi-package.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
name: Publish Pypi Package
22

33
on:
4-
push:
5-
tags:
6-
- '*'
4+
push:
5+
tags:
6+
- '*'
77

88
jobs:
9-
package:
10-
runs-on: ubuntu-latest
11-
name: Publish Pypi Package
9+
package:
10+
runs-on: ubuntu-latest
11+
name: Publish Pypi Package
1212

13-
steps:
14-
- name: Cloning repo
15-
uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 0
13+
steps:
14+
- name: Cloning repo
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
1818

19-
- name: Build binary wheel and a source tarball
20-
run: python setup.py sdist
19+
- name: Build binary wheel and a source tarball
20+
run: python setup.py sdist
2121

22-
- name: Publish Package to Pypi
23-
uses: pypa/gh-action-pypi-publish@release/v1
24-
with:
25-
user: __token__
26-
password: ${{ secrets.PYPI_API_TOKEN }}
22+
- name: Publish Package to Pypi
23+
uses: pypa/gh-action-pypi-publish@release/v1
24+
with:
25+
user: __token__
26+
password: ${{ secrets.PYPI_API_TOKEN }}

‎.github/workflows/pull-request.yml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
name: Flag Engine Pull Request
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize, reopened, ready_for_review]
6-
branches:
7-
- main
8-
- release**
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
branches:
7+
- main
8+
- release**
99

1010
jobs:
11-
test:
12-
runs-on: ubuntu-latest
13-
name: Flag engine Unit tests
14-
15-
strategy:
16-
max-parallel: 4
17-
matrix:
18-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
19-
20-
steps:
21-
- name: Cloning repo
22-
uses: actions/checkout@v4
23-
with:
24-
fetch-depth: 0
25-
submodules: recursive
26-
27-
- name: Set up Python ${{ matrix.python-version }}
28-
uses: actions/setup-python@v5
29-
with:
30-
python-version: ${{ matrix.python-version }}
31-
32-
- name: Install Dependencies
33-
run: |
34-
python -m pip install --upgrade pip
35-
pip install -r requirements.txt -r requirements-dev.txt
36-
37-
- name: Check Formatting
38-
run: black --check .
39-
40-
- name: Check Imports
41-
run: |
42-
git ls-files | grep '\.py$' | xargs absolufy-imports
43-
isort . --check
44-
45-
- name: Check flake8 linting
46-
run: flake8 .
47-
48-
- name: Check Typing
49-
run: mypy --strict .
50-
51-
- name: Run Tests
52-
run: pytest -p no:warnings
53-
54-
- name: Check Coverage
55-
uses: 5monkeys/cobertura-action@v14
56-
with:
57-
minimum_coverage: 100
58-
fail_below_threshold: true
11+
test:
12+
runs-on: ubuntu-latest
13+
name: Flag engine Unit tests
14+
15+
strategy:
16+
max-parallel: 4
17+
matrix:
18+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
19+
20+
steps:
21+
- name: Cloning repo
22+
uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0
25+
submodules: recursive
26+
27+
- name: Set up Python ${{ matrix.python-version }}
28+
uses: actions/setup-python@v5
29+
with:
30+
python-version: ${{ matrix.python-version }}
31+
32+
- name: Install Dependencies
33+
run: |
34+
python -m pip install --upgrade pip
35+
pip install -r requirements.txt -r requirements-dev.txt
36+
37+
- name: Check Formatting
38+
run: black --check .
39+
40+
- name: Check Imports
41+
run: |
42+
git ls-files | grep '\.py$' | xargs absolufy-imports
43+
isort . --check
44+
45+
- name: Check flake8 linting
46+
run: flake8 .
47+
48+
- name: Check Typing
49+
run: mypy --strict .
50+
51+
- name: Run Tests
52+
run: pytest -p no:warnings
53+
54+
- name: Check Coverage
55+
uses: 5monkeys/cobertura-action@v14
56+
with:
57+
minimum_coverage: 100
58+
fail_below_threshold: true

‎.github/workflows/release-please.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Update release PR
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
release-please:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: googleapis/release-please-action@v4
17+
with:
18+
token: ${{ secrets.RELEASE_PLEASE_GITHUB_TOKEN }}

‎.pre-commit-config.yaml‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
repos:
2-
- repo: https://github.com/pre-commit/mirrors-mypy
3-
rev: v1.5.1
4-
hooks:
5-
- id: mypy
6-
args: [--strict]
7-
additional_dependencies:
8-
[pydantic, pytest, pytest_mock, types-pytest-lazy-fixture, types-setuptools, semver]
9-
- repo: https://github.com/MarcoGorelli/absolufy-imports
10-
rev: v0.3.1
11-
hooks:
12-
- id: absolufy-imports
13-
- repo: https://github.com/PyCQA/isort
14-
rev: 5.12.0
15-
hooks:
16-
- id: isort
17-
name: isort (python)
18-
- repo: https://github.com/psf/black
19-
rev: 24.3.0
20-
hooks:
21-
- id: black
22-
language_version: python3
23-
exclude: migrations
24-
- repo: https://github.com/pycqa/flake8
25-
rev: 6.1.0
26-
hooks:
27-
- id: flake8
28-
name: flake8
29-
- repo: https://github.com/pre-commit/pre-commit-hooks
30-
rev: v4.4.0
31-
hooks:
32-
- id: check-yaml
33-
- repo: https://github.com/pre-commit/mirrors-prettier
34-
rev: v2.7.1
35-
hooks:
36-
- id: prettier
2+
- repo: https://github.com/pre-commit/mirrors-mypy
3+
rev: v1.5.1
4+
hooks:
5+
- id: mypy
6+
args: [--strict]
7+
additional_dependencies: [pydantic, pytest, pytest_mock, types-pytest-lazy-fixture, types-setuptools, semver]
8+
- repo: https://github.com/MarcoGorelli/absolufy-imports
9+
rev: v0.3.1
10+
hooks:
11+
- id: absolufy-imports
12+
- repo: https://github.com/PyCQA/isort
13+
rev: 5.12.0
14+
hooks:
15+
- id: isort
16+
name: isort (python)
17+
- repo: https://github.com/psf/black
18+
rev: 24.3.0
19+
hooks:
20+
- id: black
21+
language_version: python3
22+
exclude: migrations
23+
- repo: https://github.com/pycqa/flake8
24+
rev: 6.1.0
25+
hooks:
26+
- id: flake8
27+
name: flake8
28+
- repo: https://github.com/pre-commit/pre-commit-hooks
29+
rev: v4.4.0
30+
hooks:
31+
- id: check-yaml
32+
- repo: https://github.com/pre-commit/mirrors-prettier
33+
rev: v2.7.1
34+
hooks:
35+
- id: prettier

‎.prettierrc.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"proseWrap": "always",
3-
"singleQuote": true,
4-
"printWidth": 120,
5-
"trailingComma": "all",
6-
"tabWidth": 4,
7-
"overrides": [
8-
{
9-
"files": "*.md",
10-
"options": {
11-
"tabWidth": 1
12-
}
13-
}
14-
]
2+
"proseWrap": "always",
3+
"singleQuote": true,
4+
"printWidth": 120,
5+
"trailingComma": "all",
6+
"tabWidth": 2,
7+
"overrides": [
8+
{
9+
"files": "*.md",
10+
"options": {
11+
"tabWidth": 1
12+
}
13+
}
14+
]
1515
}

‎.release-please-manifest.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "5.3.0"
3+
}

0 commit comments

Comments
 (0)