From 025342d965cfabbdba1f846337acf36c5f7499cc Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Thu, 9 Dec 2021 20:06:48 +0100 Subject: [PATCH 1/5] Fix django-version in Github ci. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2971b369..585dd9cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,10 +34,10 @@ jobs: - "3.7" - "3.8" django-version: - - 2.2.* - - 3.1.* - - 3.2.* - - 4.* + - "2.2" + - "3.1" + - "3.2" + - "4.0" steps: - uses: actions/checkout@v2 - name: Setup Python version ${{ matrix.python-version }} From e1861a7657ccee40b0c1089fa301dc85008ee154 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Thu, 9 Dec 2021 20:09:12 +0100 Subject: [PATCH 2/5] Add Python 3.9 and 3.10 support. --- .github/workflows/ci.yml | 12 ++++++++++++ setup.cfg | 2 ++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 585dd9cc..db16c7e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,11 +33,23 @@ jobs: - "3.6" - "3.7" - "3.8" + - "3.9" + - "3.10" django-version: - "2.2" - "3.1" - "3.2" - "4.0" + exclude: + - python-version: "3.6" + django-version: "4.0" + - python-version: "3.7" + django-version: "4.0" + - python-version: "3.10" + django-version: "2.2" + - python-version: "3.10" + django-version: "3.1" + steps: - uses: actions/checkout@v2 - name: Setup Python version ${{ matrix.python-version }} diff --git a/setup.cfg b/setup.cfg index dd2ff745..bb7eb9e9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,8 @@ classifier = Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Topic :: Software Development :: Quality Assurance Topic :: System :: Logging Topic :: System :: Monitoring From c4859528f043d1ea611d0b7b4c470336b4fe7d56 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Thu, 9 Dec 2021 20:10:41 +0100 Subject: [PATCH 3/5] Add Django versions to setup classifier. --- setup.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.cfg b/setup.cfg index bb7eb9e9..aa173424 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,6 +25,11 @@ classifier = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Topic :: Software Development :: Quality Assurance + Framework :: Django + Framework :: Django :: 2.2 + Framework :: Django :: 3.1 + Framework :: Django :: 3.2 + Framework :: Django :: 4.0 Topic :: System :: Logging Topic :: System :: Monitoring Topic :: Utilities From 59ffd3c7e3f631a0e09da797e28f40a93e7ecbd9 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Thu, 9 Dec 2021 20:14:48 +0100 Subject: [PATCH 4/5] Add Python and Django supported versions badged to README. --- README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0625ecda..ed78b5fb 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ django-health-check =================== -|version| |coverage| |health| |license| +|version| |pyversion| |djversion| |coverage| |health| |license| This project checks for various conditions and provides reports when anomalous behavior is detected. @@ -299,6 +299,10 @@ Other resources .. |version| image:: https://img.shields.io/pypi/v/django-health-check.svg :target: https://pypi.python.org/pypi/django-health-check/ +.. |pyversion| image:: https://img.shields.io/pypi/pyversions/django-health-check.svg + :target: https://pypi.python.org/pypi/django-health-check/ +.. |djversion| image:: https://img.shields.io/pypi/djversions/django-health-check.svg + :target: https://pypi.python.org/pypi/django-health-check/ .. |coverage| image:: https://codecov.io/gh/KristianOellegaard/django-health-check/branch/master/graph/badge.svg :target: https://codecov.io/gh/KristianOellegaard/django-health-check .. |health| image:: https://landscape.io/github/KristianOellegaard/django-health-check/master/landscape.svg?style=flat From e81eebd95df03b7af451f9f9ecd11b41a80bd774 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Thu, 9 Dec 2021 20:19:38 +0100 Subject: [PATCH 5/5] Replace url with re_path. --- tests/testapp/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testapp/urls.py b/tests/testapp/urls.py index 29f1acc9..6fc864cd 100644 --- a/tests/testapp/urls.py +++ b/tests/testapp/urls.py @@ -1,5 +1,5 @@ -from django.conf.urls import include, url +from django.urls import include, re_path urlpatterns = [ - url(r'^ht/', include('health_check.urls')), + re_path(r'^ht/', include('health_check.urls')), ]