Skip to content

Commit

Permalink
Update dependencies (channels==4.0.0)
Browse files Browse the repository at this point in the history
requirements.min.txt contains mostly unversioned requirements for
generating newer requirements.txt more easily.

requirements.txt has been updated.

As per channels release notes; we now drop the daphne dependency,
require channels[daphne], and add daphne to the django INSTALLED_APPS.

Docs say `daphne` should be at the top of INSTALLED_APPS, because it
overrides django's `runserver`. We override daphne's `runserver` so we
put `roost_backend` ahead of `daphne`.

runserver used to be in channels, so fix our own override while we're
at it.
  • Loading branch information
asedeno committed Nov 15, 2022
1 parent 555ef9b commit d65206e
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 49 deletions.
19 changes: 19 additions & 0 deletions requirements.min.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
channels[daphne]>=4.0.0,<5
channels-redis>=4.0.0,<5
cryptography
Cython
Django>=3.2,<4.0
django-cors-headers
djangorestframework
djangorestframework-camel-case
flake8
gssapi
pycodestyle
PyJWT
pylint
pylint-django
pylint-plugin-utils
PyYAML
PyZephyr @ git+https://github.com/asedeno/python-zephyr@3c4edc9c02bc023c55a625b686af86f3d226a505
setproctitle
Twisted
98 changes: 52 additions & 46 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,61 @@
aioredis==1.3.1
asgiref==3.4.1
astroid==2.6.2
async-timeout==3.0.1
attrs==21.2.0
autobahn==21.3.1
Automat==20.2.0
cffi==1.14.6
channels==3.0.4
channels-redis==3.3.0
asgiref==3.5.2
astroid==2.12.12
async-timeout==4.0.2
attrs==22.1.0
autobahn==22.7.1
Automat==22.10.0
cffi==1.15.1
channels==4.0.0
channels-redis==4.0.0
constantly==15.1.0
cryptography==3.4.7
Cython==0.29.24
daphne==3.0.2
decorator==5.0.9
cryptography==38.0.3
Cython==0.29.32
daphne==4.0.0
decorator==5.1.1
Deprecated==1.2.13
dill==0.3.6
Django==3.2.16
django-cors-headers==3.7.0
djangorestframework==3.12.4
djangorestframework-camel-case==1.2.0
flake8==3.9.2
gssapi==1.6.14
hiredis==2.0.0
django-cors-headers==3.13.0
djangorestframework==3.14.0
djangorestframework-camel-case==1.3.0
flake8==5.0.4
gssapi==1.8.2
hyperlink==21.0.0
idna==3.2
importlib-metadata==4.6.1
incremental==21.3.0
isort==5.9.2
lazy-object-proxy==1.6.0
mccabe==0.6.1
msgpack==1.0.2
idna==3.4
importlib-metadata==4.2.0
incremental==22.10.0
isort==5.10.1
lazy-object-proxy==1.8.0
mccabe==0.7.0
msgpack==1.0.4
packaging==21.3
pkg_resources==0.0.0
platformdirs==2.5.4
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycodestyle==2.7.0
pycparser==2.20
pyflakes==2.3.1
PyJWT==2.4.0
pylint==2.9.3
pylint-django==2.4.4
pylint-plugin-utils==0.6
pyOpenSSL==20.0.1
pytz==2021.1
PyYAML==5.4.1
pycodestyle==2.9.1
pycparser==2.21
pyflakes==2.5.0
PyJWT==2.6.0
pylint==2.15.5
pylint-django==2.5.3
pylint-plugin-utils==0.7
pyOpenSSL==22.1.0
pyparsing==3.0.9
pytz==2022.6
PyYAML==6.0
PyZephyr @ git+https://github.com/asedeno/python-zephyr@3c4edc9c02bc023c55a625b686af86f3d226a505
redis==4.3.4
service-identity==21.1.0
setproctitle==1.2.2
setproctitle==1.3.2
six==1.16.0
sqlparse==0.4.2
toml==0.10.2
sqlparse==0.4.3
tomli==2.0.1
tomlkit==0.11.6
Twisted==22.10.0
txaio==21.2.1
typed-ast==1.4.3
typing-extensions==3.10.0.0
wrapt==1.12.1
zipp==3.5.0
zope.interface==5.4.0
txaio==22.2.1
typed-ast==1.5.4
typing_extensions==4.4.0
wrapt==1.14.1
zipp==3.10.0
zope.interface==5.5.1
4 changes: 2 additions & 2 deletions roost_backend/management/commands/runserver.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import os

from django.utils import autoreload
from channels.management.commands.runserver import Command as ChannelsRunserverCommand
from daphne.management.commands.runserver import Command as DaphneRunserverCommand

from ...subscribers import Manager as SubscriberManager


class Command(ChannelsRunserverCommand):
class Command(DaphneRunserverCommand):
"""Start and stop user processes when running channels dev server."""
def handle(self, *args, **options):
sm_enabled = False
Expand Down
3 changes: 2 additions & 1 deletion roost_ng/settings/django.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
# Application definition

INSTALLED_APPS = [
'roost_backend',
'roost_backend', # Docs say daphne wants to come first because it overrides
'daphne', # runserver; 'roost_backend' overrides daphne here, so second.
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down

0 comments on commit d65206e

Please sign in to comment.