Skip to content

Commit

Permalink
Merge branch 'master' into correlationid
Browse files Browse the repository at this point in the history
  • Loading branch information
sdherr authored Oct 24, 2024
2 parents ce550ca + f029e50 commit c4f556a
Show file tree
Hide file tree
Showing 52 changed files with 4,780 additions and 3,762 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# .git-blame-ignore-revs
# Format code with Black
44f832202f4b434ba9d15e8eb72f859d208dd26d
54 changes: 45 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,56 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ["3.7", "3.8", "3.9", "3.10"]
django-version: ["3.2", "4.0", "4.1", "main"]
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
django-version:
- "3.2"
- "4.1"
- "4.2"
- "5.0"
- "5.1"
- "main"
exclude:
- python-version: "3.7"
django-version: "4.0"
- python-version: "3.7"
django-version: "4.1"
- python-version: "3.12"
django-version: "4.1"
- python-version: "3.7"
django-version: "4.2"
- python-version: "3.12"
django-version: "4.2"
- python-version: "3.7"
django-version: "5.0"
- python-version: "3.8"
django-version: "5.0"
- python-version: "3.9"
django-version: "5.0"
- python-version: "3.7"
django-version: "5.1"
- python-version: "3.8"
django-version: "5.1"
- python-version: "3.9"
django-version: "5.1"
- python-version: "3.7"
django-version: "main"
- python-version: "3.8"
django-version: "main"
- python-version: "3.9"
django-version: "main"
- python-version: "3.11"
django-version: "3.2"
- python-version: "3.12"
django-version: "3.2"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -51,9 +87,9 @@ jobs:
python-version: ["3.7"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -63,6 +99,6 @@ jobs:
- name: Quality tests
env:
TOXENV: flake8
TOXENV: ruff
run: |
tox
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ __pycache__
.vscode/
.pytest_cache/
venv/
.venv/

dist/
docs/_build
Expand Down
16 changes: 16 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

version: 2

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

sphinx:
configuration: docs/conf.py

python:
install:
- requirements: docs/requirements.txt
57 changes: 0 additions & 57 deletions AUTHORS

This file was deleted.

Loading

0 comments on commit c4f556a

Please sign in to comment.