From 39bb34cb8a872e29372d63738bad98ad080e7db7 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 23 Dec 2021 16:00:31 +0100 Subject: [PATCH 1/4] tox: Move coverage from Python 3.8 to 3.10 --- .github/workflows/run_tox.yml | 4 ++-- tox.ini | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_tox.yml b/.github/workflows/run_tox.yml index 07cfba2..23f512f 100644 --- a/.github/workflows/run_tox.yml +++ b/.github/workflows/run_tox.yml @@ -19,9 +19,9 @@ jobs: - 3.5 - 3.6 - 3.7 - - 3.8 # includes tox env about code coverage + - 3.8 - 3.9 - - '3.10' + - '3.10' # includes tox env about code coverage steps: - uses: actions/checkout@v2.4.0 diff --git a/tox.ini b/tox.ini index bf16215..ffb4725 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,9 @@ envlist = py35-{django20,django21,django22}, py36-{django20,django21,django22,django30}, py37-{django20,django21,django22,django30}, - py38-{django20,django21,django22,django30,coverage}, + py38-{django20,django21,django22,django30}, py39-{django30,django32,django40}, - py310-{django32,django40}, + py310-{django32,django40,coverage}, [base] deps = @@ -28,7 +28,7 @@ deps = commands = py.test tests setenv = {[base]setenv} -[testenv:py38-coverage] +[testenv:py310-coverage] deps = {[base]deps} django==3.0 From 6cdd847c690a47da207952bf4e9f74576d55601a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 23 Dec 2021 16:04:42 +0100 Subject: [PATCH 2/4] Drop support for Python 3.5/3.6 and Django 2.0/2.1/3.0 --- .github/workflows/run_tox.yml | 4 +--- README.rst | 5 ++++- setup.py | 6 ++++++ tox.ini | 11 +++-------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/run_tox.yml b/.github/workflows/run_tox.yml index 23f512f..357f6dc 100644 --- a/.github/workflows/run_tox.yml +++ b/.github/workflows/run_tox.yml @@ -16,9 +16,7 @@ jobs: strategy: matrix: python-version: - - 3.5 - - 3.6 - - 3.7 + - 3.7 # oldest supported version - 3.8 - 3.9 - '3.10' # includes tox env about code coverage diff --git a/README.rst b/README.rst index fd6012d..c75c099 100644 --- a/README.rst +++ b/README.rst @@ -6,11 +6,14 @@ in admin. |python| |pypi| |github-actions| |coveralls| |license| -Project aims to support 3.4+ and Django 2.0+. +Project aims to support Python 3.7+ and Django 2.2+. For **Django < 2.0** version support or **python-2.x** compatibility, please use version **1.3.4** which is the last version to support **python-2.x** compatibility. +For **Django 2.0/2.1** version support or **Python 3.5/3.6** compatibility, please use version **1.5.7** which is +the last version to support **Django 2.0/2.1** and **Python 3.5/3.6** compatibility. + This django library is just a lightweight wrapper on `Select2` library and provides easy-to-use basic select2 functionality in a django project. If you need feature-rich solution, i recommend you to look at the latest diff --git a/setup.py b/setup.py index df6f929..8b47d25 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,12 @@ def run_tests(self): keywords="django select2", url='https://github.com/asyncee/django-easy-select2', download_url='https://pypi.python.org/pypi/django-easy-select2/', + + python_requires='>=3.7', + install_requires=[ + 'Django>=2.2', + ], + classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', diff --git a/tox.ini b/tox.ini index ffb4725..abe941b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,8 @@ [tox] envlist = - py35-{django20,django21,django22}, - py36-{django20,django21,django22,django30}, - py37-{django20,django21,django22,django30}, - py38-{django20,django21,django22,django30}, - py39-{django30,django32,django40}, + py37-django22, + py38-django22, + py39-{django32,django40}, py310-{django32,django40,coverage}, [base] @@ -19,10 +17,7 @@ setenv = [testenv] deps = {[base]deps} - django20: django>=2.0,<2.1 - django21: django>=2.1,<2.2 django22: django>=2.2,<2.3 - django30: django>=3.0,<3.1 django32: django>=3.2,<3.3 django40: django>=4.0,<4.1 commands = py.test tests From e990a17aa17c5afeff75718004dea6c4849b1c86 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 23 Dec 2021 16:49:47 +0100 Subject: [PATCH 3/4] Stop coveraging Python 3.8 and 3.9 (due to lack of particular need) --- .github/workflows/run_tox.yml | 4 ++-- tox.ini | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run_tox.yml b/.github/workflows/run_tox.yml index 357f6dc..38e40a0 100644 --- a/.github/workflows/run_tox.yml +++ b/.github/workflows/run_tox.yml @@ -17,8 +17,8 @@ jobs: matrix: python-version: - 3.7 # oldest supported version - - 3.8 - - 3.9 + # - 3.8 # no particial need + # - 3.9 # no particial need - '3.10' # includes tox env about code coverage steps: diff --git a/tox.ini b/tox.ini index abe941b..08c248f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,7 @@ [tox] +# No particular need for Python 3.8 and 3.9 envlist = py37-django22, - py38-django22, - py39-{django32,django40}, py310-{django32,django40,coverage}, [base] From f5551fdac86146bb1cdd9ad649dfb9ba061b7004 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 23 Dec 2021 16:12:24 +0100 Subject: [PATCH 4/4] tox.ini: Use latest stable Django during coverage recording --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 08c248f..797f9a8 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ setenv = {[base]setenv} [testenv:py310-coverage] deps = {[base]deps} - django==3.0 + django coverage commands = coverage run --source easy_select2 -m py.test tests