diff --git a/countdown/views.py b/countdown/views.py index 14d2e31..4e88134 100644 --- a/countdown/views.py +++ b/countdown/views.py @@ -1,6 +1,4 @@ """Provide an interface to countdown items.""" -# from rest_framework.decorators import action -# from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated from rest_framework.viewsets import ReadOnlyModelViewSet diff --git a/dr_botzo/settings.py b/dr_botzo/settings.py index 63856df..6a2de81 100644 --- a/dr_botzo/settings.py +++ b/dr_botzo/settings.py @@ -41,7 +41,6 @@ INSTALLED_APPS = ( 'django_extensions', 'adminplus', 'bootstrap3', - 'registration', 'rest_framework', 'countdown', 'dispatch', @@ -148,12 +147,6 @@ BOOTSTRAP3 = { } -# registration -LOGIN_REDIRECT_URL = reverse_lazy('index') -ACCOUNT_ACTIVATION_DAYS = 7 -REGISTRATION_AUTO_LOGIN = True - - # IRC module stuff # karma diff --git a/dr_botzo/urls.py b/dr_botzo/urls.py index c63f3f1..c01df9b 100644 --- a/dr_botzo/urls.py +++ b/dr_botzo/urls.py @@ -21,6 +21,5 @@ urlpatterns = [ url(r'^races/', include('races.urls')), url(r'^weather/', include('weather.urls')), - url(r'^accounts/', include('registration.backends.default.urls')), url(r'^admin/', admin.site.urls), ] diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 3672dfc..f7784f0 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -4,23 +4,23 @@ # # pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in # -appdirs==1.4.4 - # via virtualenv asgiref==3.2.10 # via django -attrs==20.2.0 +attrs==21.2.0 # via pytest -bandit==1.6.2 +backports.entry-points-selectable==1.1.0 + # via virtualenv +bandit==1.7.0 # via -r requirements/requirements-dev.in certifi==2020.6.20 # via requests chardet==3.0.4 # via requests -click==8.0.0 +click==8.0.3 # via pip-tools -coverage==5.3 +coverage[toml]==6.0.2 # via pytest-cov -distlib==0.3.1 +distlib==0.3.3 # via virtualenv django-adminplus==0.5 # via -r requirements/requirements.in @@ -28,8 +28,6 @@ django-bootstrap3==14.2.0 # via -r requirements/requirements.in django-extensions==3.0.9 # via -r requirements/requirements.in -django-registration-redux==2.8 - # via -r requirements/requirements.in django==3.1.2 # via # -r requirements/requirements.in @@ -37,29 +35,29 @@ django==3.1.2 # djangorestframework djangorestframework==3.12.1 # via -r requirements/requirements.in -dlint==0.10.3 +dlint==0.11.0 # via -r requirements/requirements-dev.in -filelock==3.0.12 +filelock==3.3.1 # via # tox # virtualenv -flake8-blind-except==0.1.1 +flake8-blind-except==0.2.0 # via -r requirements/requirements-dev.in flake8-builtins==1.5.3 # via -r requirements/requirements-dev.in -flake8-docstrings==1.5.0 +flake8-docstrings==1.6.0 # via -r requirements/requirements-dev.in -flake8-executable==2.0.4 +flake8-executable==2.1.1 # via -r requirements/requirements-dev.in flake8-fixme==1.1.1 # via -r requirements/requirements-dev.in -flake8-isort==4.0.0 +flake8-isort==4.1.1 # via -r requirements/requirements-dev.in flake8-logging-format==0.6.0 # via -r requirements/requirements-dev.in flake8-mutable==1.2.0 # via -r requirements/requirements-dev.in -flake8==3.8.4 +flake8==3.9.2 # via # -r requirements/requirements-dev.in # dlint @@ -68,9 +66,9 @@ flake8==3.8.4 # flake8-executable # flake8-isort # flake8-mutable -gitdb==4.0.5 +gitdb==4.0.9 # via gitpython -gitpython==3.1.11 +gitpython==3.1.24 # via bandit idna==2.10 # via requests @@ -80,7 +78,7 @@ iniconfig==1.1.1 # via pytest irc==15.0.6 # via -r requirements/requirements.in -isort==5.6.4 +isort==5.9.3 # via flake8-isort jaraco.classes==3.1.0 # via jaraco.collections @@ -111,41 +109,43 @@ more-itertools==8.5.0 # jaraco.itertools oauthlib==3.1.0 # via requests-oauthlib -packaging==20.4 +packaging==21.0 # via # pytest # tox parsedatetime==2.6 # via -r requirements/requirements.in -pbr==5.5.1 +pbr==5.6.0 # via stevedore -pep517==0.10.0 +pep517==0.12.0 # via pip-tools -pip-tools==6.1.0 +pip-tools==6.4.0 # via -r requirements/requirements-dev.in -pluggy==0.13.1 +platformdirs==2.4.0 + # via virtualenv +pluggy==1.0.0 # via # pytest # tox ply==3.11 # via -r requirements/requirements.in -py==1.9.0 +py==1.10.0 # via # pytest # tox -pycodestyle==2.6.0 +pycodestyle==2.7.0 # via flake8 -pydocstyle==5.1.1 +pydocstyle==6.1.1 # via flake8-docstrings -pyflakes==2.2.0 +pyflakes==2.3.1 # via flake8 -pyparsing==2.4.7 +pyparsing==3.0.1 # via packaging -pytest-cov==2.10.1 +pytest-cov==3.0.0 # via -r requirements/requirements-dev.in -pytest-django==4.1.0 +pytest-django==4.4.0 # via -r requirements/requirements-dev.in -pytest==6.1.1 +pytest==6.2.5 # via # -r requirements/requirements-dev.in # pytest-cov @@ -162,7 +162,7 @@ pytz==2020.1 # django # irc # tempora -pyyaml==5.3.1 +pyyaml==6.0 # via bandit requests-oauthlib==1.3.0 # via twython @@ -178,45 +178,51 @@ six==1.15.0 # jaraco.collections # jaraco.logging # jaraco.text - # packaging # python-dateutil # tox # virtualenv -smmap==3.0.4 +smmap==5.0.0 # via gitdb -snowballstemmer==2.0.0 +snowballstemmer==2.1.0 # via pydocstyle sqlparse==0.4.1 # via django -stevedore==3.2.2 +stevedore==3.5.0 # via bandit tempora==4.0.0 # via # irc # jaraco.logging -testfixtures==6.15.0 +testfixtures==6.18.3 # via flake8-isort -toml==0.10.1 +toml==0.10.2 # via - # pep517 # pytest # tox -tox-wheel==0.5.0 +tomli==1.2.2 + # via + # coverage + # pep517 +tox-wheel==0.6.0 # via -r requirements/requirements-dev.in -tox==3.20.1 +tox==3.24.4 # via # -r requirements/requirements-dev.in # tox-wheel twython==3.8.2 # via -r requirements/requirements.in +typing-extensions==3.10.0.2 + # via gitpython urllib3==1.25.11 # via requests -versioneer==0.18 +versioneer==0.21 # via -r requirements/requirements-dev.in -virtualenv==20.0.35 +virtualenv==20.9.0 # via tox -wheel==0.35.1 - # via tox-wheel +wheel==0.37.0 + # via + # pip-tools + # tox-wheel zalgo-text==0.6 # via -r requirements/requirements.in diff --git a/requirements/requirements.in b/requirements/requirements.in index 1614cd1..57e0425 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -2,7 +2,6 @@ Django # core django-adminplus # admin.site.register_view django-bootstrap3 # bootstrap layout django-extensions # more commands -django-registration-redux # registration views/forms djangorestframework # dispatch WS API irc==15.0.6 # core, pinned until I can bother to update --- 17.x has API changes parsedatetime # relative date stuff in countdown @@ -12,4 +11,4 @@ python-gitlab # client for the gitlab bot python-mpd2 # client for mpd pytz # timezone awareness twython # twitter client -zalgo-text # zalgoify text +zalgo-text # zalgoify text diff --git a/requirements/requirements.txt b/requirements/requirements.txt index eb6a019..686d75c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -16,8 +16,6 @@ django-bootstrap3==14.2.0 # via -r requirements/requirements.in django-extensions==3.0.9 # via -r requirements/requirements.in -django-registration-redux==2.8 - # via -r requirements/requirements.in django==3.1.2 # via # -r requirements/requirements.in