From 279e4978cd81054d8f0facee0b809d00fc0d4245 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 16 Jun 2023 14:46:47 +0500 Subject: [PATCH 01/10] fix: Support added for Django 4.2 --- .github/workflows/ci.yml | 12 +++++++++++- CHANGELOG.rst | 4 ++++ completion/__init__.py | 2 +- tox.ini | 4 +++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ae7e659..31d8c8fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,17 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [quality, django32-drf312, django32-drflatest, django40-drf312, django40-drflatest] + toxenv: [ + quality, + django32-drf312, + django32-drflatest, + django40-drf312, + django40-drflatest, + django41-drf312, + django41-drflatest, + django42-drf312, + django42-drflatest + ] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f9166451..e88bd917 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,10 @@ Change Log Unreleased ~~~~~~~~~~ +[4.2.2]- 2023-06-16 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Support added for Django 4.2 + [4.2.1]- 2023-04-26 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Support ``get_child_blocks`` along with ``get_child_descriptors``. diff --git a/completion/__init__.py b/completion/__init__.py index 00d812e0..ad69494c 100644 --- a/completion/__init__.py +++ b/completion/__init__.py @@ -2,6 +2,6 @@ Completion App """ -__version__ = '4.2.1' +__version__ = '4.2.2' default_app_config = 'completion.apps.CompletionAppConfig' # pylint: disable=invalid-name diff --git a/tox.ini b/tox.ini index 7d41f336..addf3bba 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = drf{312,latest},py38-django{32,40} +envlist = drf{312,latest},py38-django{32,40,41,42} [doc8] max-line-length = 120 @@ -21,6 +21,8 @@ norecursedirs = .* docs requirements deps = django32: Django>=3.2,<4.0 django40: Django>=4.0,<4.1 + django41: Django>=4.1,<4.2 + django42: Django>=4.2,<4.3 drf312: djangorestframework<3.13.0 drflatest: djangorestframework -r{toxinidir}/requirements/test.txt From ca8e291cd433ac64a732779770acc92c470b9dd2 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 16 Jun 2023 15:13:17 +0500 Subject: [PATCH 02/10] fix: drf312 removed for django 41 and 42 --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31d8c8fb..79ac5f6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,7 @@ jobs: django32-drflatest, django40-drf312, django40-drflatest, - django41-drf312, django41-drflatest, - django42-drf312, django42-drflatest ] From 538fe1afce6db361074f578554c0865bb55de8f4 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 16 Jun 2023 15:33:18 +0500 Subject: [PATCH 03/10] fix: coverage commaand updated to django42-drflatest --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79ac5f6b..5cee6d24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django32-drflatest' + if: matrix.python-version == '3.8' && matrix.toxenv=='django42-drflatest' uses: codecov/codecov-action@v1 with: flags: unittests From de6f8661a94b20c495a087d86c7c80960e4a33db Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 16 Jun 2023 20:13:46 +0500 Subject: [PATCH 04/10] fix: codmod applied --- completion/__init__.py | 1 - completion/api/urls.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/completion/__init__.py b/completion/__init__.py index ad69494c..d569ff69 100644 --- a/completion/__init__.py +++ b/completion/__init__.py @@ -4,4 +4,3 @@ __version__ = '4.2.2' -default_app_config = 'completion.apps.CompletionAppConfig' # pylint: disable=invalid-name diff --git a/completion/api/urls.py b/completion/api/urls.py index abc9c1d9..bcf0a5df 100644 --- a/completion/api/urls.py +++ b/completion/api/urls.py @@ -2,7 +2,7 @@ Api URLs. """ -from django.conf.urls import include +from django.urls import include from django.urls import path app_name = 'completion' # pylint: disable=invalid-name From 287a258da30935dc680b1904ad4d158541ef05bf Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Fri, 16 Jun 2023 20:18:44 +0500 Subject: [PATCH 05/10] fix: single line reverted --- completion/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/completion/__init__.py b/completion/__init__.py index d569ff69..ad69494c 100644 --- a/completion/__init__.py +++ b/completion/__init__.py @@ -4,3 +4,4 @@ __version__ = '4.2.2' +default_app_config = 'completion.apps.CompletionAppConfig' # pylint: disable=invalid-name From 6747c1836d9acd212022cb4650418d82882370ab Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 24 Jul 2023 19:34:31 +0500 Subject: [PATCH 06/10] fix: changes added requested by awais regarding drf314 --- .github/workflows/ci.yml | 6 ++---- tox.ini | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cee6d24..990e90dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,9 @@ jobs: python-version: ['3.8'] toxenv: [ quality, - django32-drf312, + django32-drf314, + django42-drf314, django32-drflatest, - django40-drf312, - django40-drflatest, - django41-drflatest, django42-drflatest ] diff --git a/tox.ini b/tox.ini index addf3bba..eb6aedb2 100644 --- a/tox.ini +++ b/tox.ini @@ -20,10 +20,8 @@ norecursedirs = .* docs requirements [testenv] deps = django32: Django>=3.2,<4.0 - django40: Django>=4.0,<4.1 - django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 - drf312: djangorestframework<3.13.0 + drf314: djangorestframework<3.14.1 drflatest: djangorestframework -r{toxinidir}/requirements/test.txt commands = From e53cd615c3f6fac8b083185da04e47c9e64c5883 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 24 Jul 2023 19:38:24 +0500 Subject: [PATCH 07/10] fix: tox changees added --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index eb6aedb2..28c16492 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = drf{312,latest},py38-django{32,40,41,42} +envlist = drf{314,latest},py38-django{32,42} [doc8] max-line-length = 120 @@ -21,7 +21,7 @@ norecursedirs = .* docs requirements deps = django32: Django>=3.2,<4.0 django42: Django>=4.2,<4.3 - drf314: djangorestframework<3.14.1 + drf314: djangorestframework<3.15.0 drflatest: djangorestframework -r{toxinidir}/requirements/test.txt commands = From ba7dececad2b9f10385e4003d6380ff7a041544a Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 20:17:13 +0500 Subject: [PATCH 08/10] fix: drf314 added --- .github/workflows/ci.yml | 8 +------- tox.ini | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 990e90dc..5a87e846 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,13 +15,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [ - quality, - django32-drf314, - django42-drf314, - django32-drflatest, - django42-drflatest - ] + toxenv: [quality, django32-drf314, django32-drflatest, django42-drf314, django42-drflatest] steps: - uses: actions/checkout@v2 diff --git a/tox.ini b/tox.ini index 28c16492..1dae532e 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,6 @@ norecursedirs = .* docs requirements [testenv] deps = django32: Django>=3.2,<4.0 - django42: Django>=4.2,<4.3 drf314: djangorestframework<3.15.0 drflatest: djangorestframework -r{toxinidir}/requirements/test.txt From cc3f8b92d91c42d31599718491361ff192b28242 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 25 Jul 2023 20:28:32 +0500 Subject: [PATCH 09/10] fix: url.py reverted --- completion/api/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completion/api/urls.py b/completion/api/urls.py index bcf0a5df..abc9c1d9 100644 --- a/completion/api/urls.py +++ b/completion/api/urls.py @@ -2,7 +2,7 @@ Api URLs. """ -from django.urls import include +from django.conf.urls import include from django.urls import path app_name = 'completion' # pylint: disable=invalid-name From 046d90dc778a9f50480d722718acfe43c003214e Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 26 Jul 2023 17:49:12 +0500 Subject: [PATCH 10/10] fix: added changes requested by usama --- CHANGELOG.rst | 4 ++-- completion/__init__.py | 2 +- tox.ini | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e88bd917..edea6ca4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,9 +14,9 @@ Change Log Unreleased ~~~~~~~~~~ -[4.2.2]- 2023-06-16 +[4.3.0]- 2023-07-26 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Support added for Django 4.2 +* Added support for Django 4.2 [4.2.1]- 2023-04-26 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/completion/__init__.py b/completion/__init__.py index ad69494c..bfda3213 100644 --- a/completion/__init__.py +++ b/completion/__init__.py @@ -2,6 +2,6 @@ Completion App """ -__version__ = '4.2.2' +__version__ = '4.3.0' default_app_config = 'completion.apps.CompletionAppConfig' # pylint: disable=invalid-name diff --git a/tox.ini b/tox.ini index 1dae532e..28c16492 100644 --- a/tox.ini +++ b/tox.ini @@ -20,6 +20,7 @@ norecursedirs = .* docs requirements [testenv] deps = django32: Django>=3.2,<4.0 + django42: Django>=4.2,<4.3 drf314: djangorestframework<3.15.0 drflatest: djangorestframework -r{toxinidir}/requirements/test.txt