Skip to content

Commit

Permalink
Merge branch 'main' into docs/contributing
Browse files Browse the repository at this point in the history
  • Loading branch information
carltongibson authored Dec 10, 2023
2 parents e077e3f + 33db839 commit 9003b78
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
Expand All @@ -40,7 +40,7 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
9 changes: 8 additions & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,18 @@ Make sure the tests pass:
python -m pip install -e .[tests,daphne]
pytest
.. 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:

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ and `tutorial <https://channels.readthedocs.io/en/latest/tutorial/index.html>`_
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
Expand Down
5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ 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
Framework :: Django :: 4
Framework :: Django :: 4.0
Framework :: Django :: 4.1
Framework :: Django :: 4.2
Framework :: Django :: 5.0
Topic :: Internet :: WWW/HTTP

[options]
Expand All @@ -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 =
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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]
Expand Down

0 comments on commit 9003b78

Please sign in to comment.