From a7048e8ab34c2e049e289f7cea24a55c37fa3185 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Thu, 23 Nov 2023 19:59:12 +0000 Subject: [PATCH 1/2] chore: Add note for zsh and swap pytest for tox --- CONTRIBUTING.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 19faea4bc..fdc919886 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -26,13 +26,20 @@ Make sure the tests pass: .. code-block:: sh python -m pip install -e .[tests] - pytest + tox + +.. note:: + If you're using ``zsh`` for your shell, the above command will fail with a + ``zsh: no matches found: .[tests]`` error. + To fix this use ``noglob``:: + + noglob python -m pip install -e .[tests] Make your change. Add tests for your change. Make the tests pass: .. code-block:: sh - pytest + tox Make sure your code conforms to the coding style: From dc9d1195f393d1cbb98db5e778b27f5a64cc131f Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Thu, 23 Nov 2023 20:06:59 +0000 Subject: [PATCH 2/2] test: Add python 3.12, drop 3.7 and add django 5.0 --- .github/workflows/tests.yml | 2 +- README.rst | 4 ++-- setup.cfg | 5 +++-- tox.ini | 6 ++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3fa0cce4a..235485c87 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,11 +14,11 @@ jobs: fail-fast: false matrix: python-version: - - "3.7" - "3.8" - "3.9" - "3.10" - "3.11" + - "3.12" steps: - uses: actions/checkout@v4 diff --git a/README.rst b/README.rst index 680ee02dd..f1cd6176c 100644 --- a/README.rst +++ b/README.rst @@ -35,8 +35,8 @@ and `tutorial `_ Dependencies ------------ -All Channels projects currently support Python 3.7 and up. ``channels`` is -compatible with Django 3.2, 4.0, 4.1, and 4.2. +All Channels projects currently support Python 3.8 and up. ``channels`` is +compatible with Django 3.2, 4.0, 4.1, 4.2 and 5.0. Contributing diff --git a/setup.cfg b/setup.cfg index a1ff1c04b..b956947cb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,11 +16,11 @@ classifiers = Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Framework :: Django Framework :: Django :: 3 Framework :: Django :: 3.2 @@ -28,6 +28,7 @@ classifiers = Framework :: Django :: 4.0 Framework :: Django :: 4.1 Framework :: Django :: 4.2 + Framework :: Django :: 5.0 Topic :: Internet :: WWW/HTTP [options] @@ -36,7 +37,7 @@ include_package_data = True install_requires = Django>=3.2 asgiref>=3.5.0,<4 -python_requires = >=3.7 +python_requires = >=3.8 [options.extras_require] tests = diff --git a/tox.ini b/tox.ini index faccbdc4c..4aa9b8016 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ [tox] envlist = - py{37,38,39,310}-dj32 + py{38,39,310}-dj32 py{38,39,310}-dj40 py{38,39,310,311}-dj41 py{38,39,310,311}-dj42 - py{310,311}-djmain + py{310,311,312}-dj50 + py{310,311,312}-djmain qa [testenv] @@ -16,6 +17,7 @@ deps = dj40: Django>=4.0,<4.1 dj41: Django>=4.1.2,<4.2 dj42: Django>=4.2,<5.0 + dj50: Django>=5.0rc1,<5.1 djmain: https://github.com/django/django/archive/main.tar.gz [testenv:qa]