Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bryan BRANCOTTE
django-basetheme-bootstrap
Commits
4e2a19d5
Commit
4e2a19d5
authored
Mar 26, 2020
by
Bryan BRANCOTTE
Browse files
Django3 compatibility
parent
d201da12
Pipeline
#26630
failed with stage
in 57 seconds
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
4e2a19d5
...
...
@@ -3,30 +3,67 @@ image: docker:latest
stages
:
-
test
test35
:
test35
-django2
:
stage
:
test
image
:
python:3.5
script
:
-
pip install 'django<3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
test36
:
test36
-django2
:
stage
:
test
image
:
python:3.6
script
:
-
pip install 'django<3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
test37
:
test37
-django2
:
stage
:
test
image
:
python:3.7
script
:
-
pip install 'django<3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
testrc
:
testrc
-django2
:
stage
:
test
image
:
python:rc
script
:
-
pip install 'django<3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
test35-django3
:
stage
:
test
image
:
python:3.5
script
:
-
pip install 'django>=3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
test36-django3
:
stage
:
test
image
:
python:3.6
script
:
-
pip install 'django>=3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
test37-django3
:
stage
:
test
image
:
python:3.7
script
:
-
pip install 'django>=3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
testrc-django3
:
stage
:
test
image
:
python:rc
script
:
-
pip install 'django>=3'
-
pip install -r requirements.txt
-
coverage run --source='basetheme_bootstrap' manage.py test && coverage report -m
\ No newline at end of file
basetheme_bootstrap/tokens.py
View file @
4e2a19d5
import
six
from
django.contrib.auth.tokens
import
PasswordResetTokenGenerator
from
django.utils
import
six
class
TokenGenerator
(
PasswordResetTokenGenerator
):
...
...
basetheme_bootstrap/views.py
View file @
4e2a19d5
...
...
@@ -111,7 +111,7 @@ def send_account_created(request, user, auto_active=False):
try
:
activation_link
=
request
.
scheme
+
"://"
+
request
.
get_host
()
activation_link
+=
reverse
(
'basetheme_bootstrap:activate'
,
kwargs
=
{
'uidb64'
:
urlsafe_base64_encode
(
force_bytes
(
user
.
pk
))
.
decode
()
,
'uidb64'
:
urlsafe_base64_encode
(
force_bytes
(
user
.
pk
)),
'token'
:
tokens
.
account_activation_token
.
make_token
(
user
)
})
if
auto_active
:
...
...
requirements.txt
View file @
4e2a19d5
django
django-crispy-forms
coverage
six
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment