Skip to content

Commit

Permalink
Merge pull request #20 from pbs/OCTO-10654-Django-4-2-7
Browse files Browse the repository at this point in the history
OCTO-10654 Django 4.2.7 upgrade
  • Loading branch information
lorandvarga authored Nov 14, 2023
2 parents 99ef3de + 369c41a commit 2ac9677
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 75 deletions.
12 changes: 2 additions & 10 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,9 @@ jobs:
- name: Run tests
run: |
docker-compose down
docker-compose run --rm test_py38_dj3219
docker-compose run --rm test_py38_dj427
docker-compose down
docker-compose run --rm test_py38_dj40
docker-compose down
docker-compose run --rm test_py38_dj426
docker-compose down
docker-compose run --rm test_py310_dj3219
docker-compose down
docker-compose run --rm test_py310_dj40
docker-compose down
docker-compose run --rm test_py310_dj426
docker-compose run --rm test_py310_dj427
docker-compose down
- name: Publish test results
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about your project and its dependencies
# Requirements

* Python >=3.8 (tested with Python 3.8, 3.10)
* Django >=3.2<=4.2.6
* Django >=4 < 5

# Installation

Expand Down
68 changes: 6 additions & 62 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.8'

services:
test_py38_dj3219:
test_py38_dj427:
image: python:3.8-slim-bullseye
environment:
- PYTHONWARNINGS=always
Expand All @@ -10,68 +10,12 @@ services:
command: sh -c "
cd django-heartbeat;
pip install --upgrade pip;
pip install Django==3.2.19 pytest pytest-html;
pip install Django==4.2.7 pytest pytest-html;
pip install -e .;
pytest tests -vv --html=./test-results_py38_dj3219.html --self-contained-html
pytest tests -vv --html=./test-results_py38_dj427.html --self-contained-html
"
test_py38_dj40:
image: python:3.8-slim-bullseye
environment:
- PYTHONWARNINGS=always
volumes:
- .:/django-heartbeat
command: sh -c "
cd django-heartbeat;
pip install --upgrade pip;
pip install Django==4.0 pytest pytest-html;
pip install -e .;
pytest tests -vv --html=./test-results_py38_dj40.html --self-contained-html
"
test_py38_dj426:
image: python:3.8-slim-bullseye
environment:
- PYTHONWARNINGS=always
volumes:
- .:/django-heartbeat
command: sh -c "
cd django-heartbeat;
pip install --upgrade pip;
pip install Django==4.2.6 pytest pytest-html;
pip install -e .;
pytest tests -vv --html=./test-results_py38_dj426.html --self-contained-html
"
test_py310_dj3219:
image: python:3.10-slim-bullseye
environment:
- PYTHONWARNINGS=always
volumes:
- .:/django-heartbeat
command: sh -c "
cd django-heartbeat;
pip install --upgrade pip;
pip install Django==3.2.19 pytest pytest-html;
pip install -e .;
pytest tests -vv --html=./test-results_py310_dj3219.html --self-contained-html
"
test_py310_dj40:
image: python:3.10-slim-bullseye
environment:
- PYTHONWARNINGS=always
volumes:
- .:/django-heartbeat
command: sh -c "
cd django-heartbeat;
pip install --upgrade pip;
pip install Django==4.0 pytest pytest-html;
pip install -e .;
pytest tests -vv --html=./test-results_py310_dj40.html --self-contained-html
"
test_py310_dj426:
test_py310_dj427:
image: python:3.10-slim-bullseye
environment:
- PYTHONWARNINGS=always
Expand All @@ -80,7 +24,7 @@ services:
command: sh -c "
cd django-heartbeat;
pip install --upgrade pip;
pip install Django==4.2.6 pytest pytest-html;
pip install Django==4.2.7 pytest pytest-html;
pip install -e .;
pytest tests -vv --html=./test-results_py310_dj426.html --self-contained-html
pytest tests -vv --html=./test-results_py310_dj427.html --self-contained-html
"
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ classifiers = [
"Programming Language :: Python :: 3",
]
dependencies = [
"Django>=3.2,<=4.2.6",
"Django>=4,<5",
"psutil"
]
version = "2.2.1"
version = "2.2.2"

[tool.setuptools]
zip-safe = false
Expand Down

0 comments on commit 2ac9677

Please sign in to comment.