From 82f1ee4bbef000fe64b1bab2ef72bac3e8ea44b9 Mon Sep 17 00:00:00 2001 From: Patrick Altman Date: Sat, 24 Apr 2021 16:38:15 -0500 Subject: [PATCH 1/2] Update urls --- account/urls.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/account/urls.py b/account/urls.py index 3a52e728..6ee8ed4f 100644 --- a/account/urls.py +++ b/account/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import path from account.views import ( ChangePasswordView, @@ -13,13 +13,13 @@ ) urlpatterns = [ - url(r"^signup/$", SignupView.as_view(), name="account_signup"), - url(r"^login/$", LoginView.as_view(), name="account_login"), - url(r"^logout/$", LogoutView.as_view(), name="account_logout"), - url(r"^confirm_email/(?P\w+)/$", ConfirmEmailView.as_view(), name="account_confirm_email"), - url(r"^password/$", ChangePasswordView.as_view(), name="account_password"), - url(r"^password/reset/$", PasswordResetView.as_view(), name="account_password_reset"), - url(r"^password/reset/(?P[0-9A-Za-z]+)-(?P.+)/$", PasswordResetTokenView.as_view(), name="account_password_reset_token"), - url(r"^settings/$", SettingsView.as_view(), name="account_settings"), - url(r"^delete/$", DeleteView.as_view(), name="account_delete"), + path("signup/", SignupView.as_view(), name="account_signup"), + path("login/", LoginView.as_view(), name="account_login"), + path("logout/", LogoutView.as_view(), name="account_logout"), + path("confirm_email//", ConfirmEmailView.as_view(), name="account_confirm_email"), + path("password/", ChangePasswordView.as_view(), name="account_password"), + path("password/reset/", PasswordResetView.as_view(), name="account_password_reset"), + path("password/reset///$", PasswordResetTokenView.as_view(), name="account_password_reset_token"), + path("settings/", SettingsView.as_view(), name="account_settings"), + path("delete/", DeleteView.as_view(), name="account_delete"), ] From 39ca87430ede12626f96bb5b5da0791f23c1c43d Mon Sep 17 00:00:00 2001 From: Patrick Altman Date: Sat, 24 Apr 2021 16:51:42 -0500 Subject: [PATCH 2/2] Drop support for 3.0 and add 3.2 --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 25fa9d1d..181ee088 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,7 @@ jobs: lint: name: Linting runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v2 @@ -12,7 +12,7 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.9 - + - name: isort uses: jamescurtin/isort-action@master @@ -31,11 +31,11 @@ jobs: strategy: matrix: python: [3.6, 3.7, 3.8, 3.9] - django: [2.2.*, 3.0.*, 3.1.*] + django: [2.2.*, 3.1.*, 3.2.*] include: - python: 3.5 django: 2.2.* - + steps: - uses: actions/checkout@v2