Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Django 4.2, Python 3.12 build targets #114

Merged
merged 1 commit into from
Nov 10, 2023
Merged

Add Django 4.2, Python 3.12 build targets #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ jobs:
env:
CODECOV_TOKEN: ${{secrets.codecov_token}}

python3_12-django4_2-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Test py3.12-dj4.2
run: |
docker build --build-arg PYTHON_VERSION=3.12 --build-arg DJANGO_VERSION=4.2 -t native -f Dockerfile-tmpl .
docker run -e CODECOV_TOKEN=$CODECOV_TOKEN --rm native sh -c 'pytest --cov --cov-report=term-missing && codecov'
env:
CODECOV_TOKEN: ${{secrets.codecov_token}}

publish-pypi:
needs: [
quality-checks, python3_6-django1_11-tests,
Expand Down
23 changes: 22 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ build: \
build_dj2.0_py3.6 \
build_dj2.2_py3.8 \
build_dj3.2_py3.9 \
build_dj4.1_py3.11
build_dj4.1_py3.11 \
build_dj4.2_py3.12

build_dj1.11_py3.6:
DOCKER_BUILDKIT=1 docker build \
Expand Down Expand Up @@ -55,6 +56,15 @@ build_dj4.1_py3.11:
-t native:3.11-4.1-latest \
-f Dockerfile-tmpl .

build_dj4.2_py3.12:
DOCKER_BUILDKIT=1 docker build \
--no-cache \
--progress=plain \
--build-arg PYTHON_VERSION=3.12 \
--build-arg DJANGO_VERSION=4.2 \
-t native:3.12-4.2-latest \
-f Dockerfile-tmpl .

# --- Code quality ---

code_quality:
Expand Down Expand Up @@ -86,6 +96,10 @@ shell_dj4.1_py3.11:
# Django 4.1 (Python 3.11)
docker run --rm -it --entrypoint bash native:3.11-4.1-latest

shell_dj4.2_py3.12:
# Django 4.2 (Python 3.12)
docker run --rm -it --entrypoint bash native:3.12-4.2-latest

# --- Tests ---

localtests: \
Expand All @@ -94,6 +108,7 @@ localtests: \
tests_dj2.2_py3.8 \
tests_dj3.2_py3.9 \
tests_dj4.1_py3.11 \
tests_dj4.2_py3.12 \
tests_coverage

tests_dj1.11_py3.6:
Expand Down Expand Up @@ -126,6 +141,12 @@ tests_dj4.1_py3.11:
--rm native:3.11-4.1-latest\
pytest --cov --cov-append --cov-report=term-missing

tests_dj4.2_py3.12:
# Django 4.2 (Python 3.12)
docker run -v $(CUR_PATH):/usr/app \
--rm native:3.12-4.2-latest\
pytest --cov --cov-append --cov-report=term-missing

tests_coverage:
# Coverage report
docker run -v $(CUR_PATH):/usr/app \
Expand Down
Loading