Merge lp:~widelands-dev/widelands-website/update_third_party_apps into lp:widelands-website

Proposed by kaputtnik
Status: Merged
Merged at revision: 524
Proposed branch: lp:~widelands-dev/widelands-website/update_third_party_apps
Merge into: lp:widelands-website
Diff against target: 396 lines (+71/-67)
23 files modified
local_settings.py.sample (+3/-4)
mainpage/forms.py (+1/-1)
mainpage/templates/mainpage/header.html (+2/-2)
mainpage/templates/mainpage/right_boxes.html (+1/-1)
pip_requirements.txt (+40/-35)
templates/django_registration/activate.html (+2/-2)
templates/django_registration/activation_complete.html (+2/-2)
templates/django_registration/activation_email_body.txt (+1/-1)
templates/django_registration/registration_complete.html (+1/-1)
templates/django_registration/registration_form.html (+1/-1)
templates/registration/login.html (+2/-2)
templates/registration/logout.html (+1/-1)
templates/registration/password_change_done.html (+1/-1)
templates/registration/password_change_form.html (+1/-1)
templates/registration/password_reset_complete.html (+2/-2)
templates/registration/password_reset_confirm.html (+1/-1)
templates/registration/password_reset_done.html (+1/-1)
templates/registration/password_reset_email.html (+1/-1)
templates/registration/password_reset_form.html (+1/-1)
templates/star_rating/rate.html (+1/-1)
threadedcomments/templates/threadedcomments/inlines/comments.html (+1/-1)
urls.py (+3/-3)
wlprofile/templates/wlprofile/edit_profile.html (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands-website/update_third_party_apps
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+364024@code.launchpad.net

Commit message

Updated pip_requirements.txt

Description of the change

Update third party apps for the virtualenvironment.

The update of django-registration fixes also an error if one demands a new password in case he has forgotten it.

The update of mysqlclient is needed also on my system, because the old one gives a compile error when trying to install it in a new virtualenvironment.

To get this in:
set maintenance
merge the branch
run: pip install -r pip_requirements.txt
run: ./manage.py migrate
unset maintenance

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Just 1 nit and a few typos. Feel free to merge and deploy straight away after fixing.

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Thanks, it's always good to have a second pair of eyes :)

Revision history for this message
kaputtnik (franku) wrote :

The installation of soupsieve fails because a 'Operation not permitted' failure:

Operation not permitted: '.../lib/python2.7/site-packages/backports/__init__.py'

The permissions of this folder looks good to me though. Will test on alpha.

Revision history for this message
kaputtnik (franku) wrote :

Ok, on alpha it works.

I guess if found the reason: Some files/directories in the virtualenvironment for wl.widelands.org ('../lib/python2.7/site-packages/') have the user and group set to user sirver.

I think we need to change the SGID-bit of the directory '../lib/python2.7/site-packages/' and change the group of each file/directory below to www-data.

sirver?

https://en.wikipedia.org/wiki/Setuid#SGID

Revision history for this message
kaputtnik (franku) wrote :

Updating the packages by hand did the work...

Sorry for the amazing amount of server errors :[] I didn't recognized that i had updated django-registration and started the website again, without merging this branch.

524. By kaputtnik

updated third party packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'local_settings.py.sample'
--- local_settings.py.sample 2018-11-26 19:10:39 +0000
+++ local_settings.py.sample 2019-03-06 16:38:16 +0000
@@ -37,10 +37,9 @@
37 }37 }
38}38}
3939
40# The following are just dummy values, but needed defined40# If you want to test the registration, you will need these keys.
41# To use the registration you have to create an API key pair41# For testing purposes, grab the values from:
42# See https://developers.google.com/recaptcha/docs/start42# https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha-v2-what-should-i-do
43# You have to use 'localhost' as Domain
44NORECAPTCHA_SITE_KEY = 'dummy'43NORECAPTCHA_SITE_KEY = 'dummy'
45NORECAPTCHA_SECRET_KEY = 'dummy'44NORECAPTCHA_SECRET_KEY = 'dummy'
4645
4746
=== modified file 'mainpage/forms.py'
--- mainpage/forms.py 2018-09-04 18:17:07 +0000
+++ mainpage/forms.py 2019-03-06 16:38:16 +0000
@@ -2,7 +2,7 @@
2# encoding: utf-82# encoding: utf-8
33
4from django import forms4from django import forms
5from registration.forms import RegistrationForm5from django_registration.forms import RegistrationForm
6from nocaptcha_recaptcha.fields import NoReCaptchaField6from nocaptcha_recaptcha.fields import NoReCaptchaField
7from wlprofile.models import Profile as wlprofile7from wlprofile.models import Profile as wlprofile
88
99
=== modified file 'mainpage/templates/mainpage/header.html'
--- mainpage/templates/mainpage/header.html 2019-01-24 18:03:54 +0000
+++ mainpage/templates/mainpage/header.html 2019-03-06 16:38:16 +0000
@@ -40,9 +40,9 @@
40 <br />40 <br />
41 <a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>41 <a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>
42 <br />42 <br />
43 <a href="{% url 'auth_logout' %}?next=/">Logout</a>43 <a href="{% url 'logout' %}?next=/">Logout</a>
44 {% else %}44 {% else %}
45 <a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Login/Register</a>45 <a href="{% url 'login' %}?next={{ request.path|iriencode }}">Login/Register</a>
46 {% endif %}46 {% endif %}
47 </li>47 </li>
48</ul>48</ul>
4949
=== modified file 'mainpage/templates/mainpage/right_boxes.html'
--- mainpage/templates/mainpage/right_boxes.html 2019-01-24 18:03:54 +0000
+++ mainpage/templates/mainpage/right_boxes.html 2019-03-06 16:38:16 +0000
@@ -40,7 +40,7 @@
40 </form>40 </form>
41 {% endif %}41 {% endif %}
42 {% else %}42 {% else %}
43 <p class="small"><a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Log in</a> to vote!</p>43 <p class="small"><a href="{% url 'login' %}?next={{ request.path|iriencode }}">Log in</a> to vote!</p>
44 <div class="center">44 <div class="center">
45 <input type="button" value="Results" onclick="location='{% url 'wlpoll_detail' p.id %}'" />45 <input type="button" value="Results" onclick="location='{% url 'wlpoll_detail' p.id %}'" />
46 </div>46 </div>
4747
=== modified file 'pip_requirements.txt'
--- pip_requirements.txt 2018-11-19 17:19:29 +0000
+++ pip_requirements.txt 2019-03-06 16:38:16 +0000
@@ -1,45 +1,50 @@
1# Python requirements for widelands-website at 22.06.20171# Python requirements for widelands-website at 22.06.2017
22
3beautifulsoup4==4.6.33beautifulsoup4==4.7.1
4Django==1.11.124bleach==3.1.0
5Django==1.11.20
5django-haystack==2.8.16django-haystack==2.8.1
6# django-messages is very old on pypi7# django-messages is very old on pypi
7# Do not install newer versions because our notifications app is affected8# Do not install newer versions because our notifications app is affected
8-e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages9-e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages
9django-nocaptcha-recaptcha==0.0.1910django-nocaptcha-recaptcha==0.0.20
10django-star-ratings==0.7.011django-star-ratings==0.7.0
11dj-pagination==2.3.212dj-pagination==2.4.0
12django-registration==2.4.113django-registration==3.0
13django-tagging==0.4.514django-tagging==0.4.6
14gunicorn==19.7.115gunicorn==19.9.0
15lxml==4.2.516lxml==4.3.2
16Markdown==2.6.817Markdown==3.0.1
17mysqlclient==1.3.1018mysqlclient==1.4.2.post1
18numpy==1.13.019numpy==1.16.2
19Pillow==4.1.120Pillow==5.4.1
20pydot==1.2.321pydot==1.4.1
21pyparsing==2.2.022pyparsing==2.3.1
22Sphinx==1.6.223Sphinx==1.8.4
23untokenize==0.1.124untokenize==0.1.1
24bleach==2.0.0
25Whoosh==2.7.425Whoosh==2.7.4
2626
27# Dependencies for Sphinx (automatically installed):27# Automatically installed dependencies
28# snowballstemmer==1.2.128
29# alabaster==0.7.1029# Dependencies for django-registration:
30# sphinxcontrib-websupport==1.0.130 # confusable-homoglyphs=3.0
31# Pygments==2.2.031
32# requests==2.18.1, installs: idna, urllib3, chardet, certifi32# Dependencies for Sphinx:
33# Babel==2.4.0, installs: pytz33 # snowballstemmer==1.2.1
34# docutils==0.13.134 # alabaster==0.7.10
35# Jinja2==2.9.6, installs: MarkupSafe35 # sphinxcontrib-websupport==1.0.1
36# typing==3.6.136 # Pygments==2.2.0
37# imagesize==0.7.137 # requests==2.18.1, installs: idna, urllib3, chardet, certifi
38# six==1.10.038 # Babel==2.4.0, installs: pytz
3939 # docutils==0.13.1
40# Dependencies for bleach (automatically installed):40 # Jinja2==2.9.6, installs: MarkupSafe
41# six41 # typing==3.6.1
42# html5lib==0.999999999, installs: six, setuptools, webencodings42 # imagesize==0.7.1
4343 # six==1.10.0
44# Dependencies for Pillow (automatically installed):44 # packaging==19.0
45# olefile==0.4445
46# Depencies for beautifulsoup:
47 # soupsieve==1.8, installs backports.functools-lru-cache
48
49# Dependencies for bleach:
50 # six
4651
=== renamed directory 'templates/registration' => 'templates/django_registration'
=== modified file 'templates/django_registration/activate.html'
--- templates/registration/activate.html 2018-10-14 14:20:48 +0000
+++ templates/django_registration/activate.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
@@ -15,7 +15,7 @@
15<div class="blogEntry">15<div class="blogEntry">
16 <p class="errormessage">16 <p class="errormessage">
17 An error occured: Either this account has already been activated or activation key is invalid.<br />17 An error occured: Either this account has already been activated or activation key is invalid.<br />
18 Try <a href="{% url 'auth_login' %}">logging in</a>.18 Try <a href="{% url 'login' %}">logging in</a>.
19 </p>19 </p>
20</div>20</div>
21{% endblock %}21{% endblock %}
2222
=== modified file 'templates/django_registration/activation_complete.html'
--- templates/registration/activation_complete.html 2018-10-14 13:24:15 +0000
+++ templates/django_registration/activation_complete.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
@@ -14,7 +14,7 @@
14{% block content_main %}14{% block content_main %}
15<div class="blogEntry">15<div class="blogEntry">
16 <p>16 <p>
17 You are now activated and can <a href="{% url 'auth_login' %}">log in</a>.17 You are now activated and can <a href="{% url 'login' %}">log in</a>.
18 </p>18 </p>
19</div>19</div>
20{% endblock %}20{% endblock %}
2121
=== renamed file 'templates/registration/activation_email.txt' => 'templates/django_registration/activation_email_body.txt'
--- templates/registration/activation_email.txt 2016-03-07 20:38:39 +0000
+++ templates/django_registration/activation_email_body.txt 2019-03-06 16:38:16 +0000
@@ -3,7 +3,7 @@
3You (or someone else) requested an account on {{ site }}. If this wasn't you, 3You (or someone else) requested an account on {{ site }}. If this wasn't you,
4please ignore this email. If this was you, please click on the link provided below4please ignore this email. If this was you, please click on the link provided below
55
6http://{{ site }}{% url 'registration_activate' activation_key %}6http://{{ site }}{% url 'django_registration_activate' activation_key %}
77
88
9This link will be valid for {{ expiration_days }} days...9This link will be valid for {{ expiration_days }} days...
1010
=== modified file 'templates/django_registration/registration_complete.html'
--- templates/registration/registration_complete.html 2018-10-14 13:24:15 +0000
+++ templates/django_registration/registration_complete.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== modified file 'templates/django_registration/registration_form.html'
--- templates/registration/registration_form.html 2018-10-14 13:24:15 +0000
+++ templates/django_registration/registration_form.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "django_registration/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== added directory 'templates/registration'
=== renamed file 'templates/registration/login.html' => 'templates/registration/login.html'
--- templates/registration/login.html 2018-10-14 13:24:15 +0000
+++ templates/registration/login.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
22
3{% block title %}3{% block title %}
4Login - {{ block.super }}4Login - {{ block.super }}
@@ -40,6 +40,6 @@
40 <input type="submit" value="login" />40 <input type="submit" value="login" />
41 <input type="hidden" name="next" value="{{ next }}" />41 <input type="hidden" name="next" value="{{ next }}" />
42 </form>42 </form>
43 <p><a href="{% url 'auth_password_reset' %}">Lost password?</a> | <a href="{% url 'registration_register' %}">Register now!</a></p>43 <p><a href="{% url 'password_reset' %}">Lost password?</a> | <a href="{% url 'django_registration_register' %}">Register now!</a></p>
44</div>44</div>
45{% endblock %}45{% endblock %}
4646
=== renamed file 'templates/registration/logout.html' => 'templates/registration/logout.html'
--- templates/registration/logout.html 2018-11-09 07:00:30 +0000
+++ templates/registration/logout.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
22
3{% block title %}3{% block title %}
4Logout - {{ block.super }}4Logout - {{ block.super }}
55
=== renamed file 'templates/registration/password_change_done.html' => 'templates/registration/password_change_done.html'
--- templates/registration/password_change_done.html 2018-10-14 13:24:15 +0000
+++ templates/registration/password_change_done.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== renamed file 'templates/registration/password_change_form.html' => 'templates/registration/password_change_form.html'
--- templates/registration/password_change_form.html 2018-10-14 13:24:15 +0000
+++ templates/registration/password_change_form.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== renamed file 'templates/registration/password_reset_complete.html' => 'templates/registration/password_reset_complete.html'
--- templates/registration/password_reset_complete.html 2018-10-14 13:24:15 +0000
+++ templates/registration/password_reset_complete.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
@@ -16,7 +16,7 @@
16{% block content_main %}16{% block content_main %}
17<div class="blogEntry">17<div class="blogEntry">
18 <p>18 <p>
19 Your new password has been set. You may go ahead and <a href="{% url 'auth_login' %}">log in</a> now.19 Your new password has been set. You may go ahead and <a href="{% url 'login' %}">log in</a> now.
20 </p>20 </p>
21</div>21</div>
22{% endblock %}22{% endblock %}
2323
=== renamed file 'templates/registration/password_reset_confirm.html' => 'templates/registration/password_reset_confirm.html'
--- templates/registration/password_reset_confirm.html 2018-10-14 14:20:48 +0000
+++ templates/registration/password_reset_confirm.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== renamed file 'templates/registration/password_reset_done.html' => 'templates/registration/password_reset_done.html'
--- templates/registration/password_reset_done.html 2018-10-14 13:24:15 +0000
+++ templates/registration/password_reset_done.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== renamed file 'templates/registration/password_reset_email.html' => 'templates/registration/password_reset_email.html'
--- templates/registration/password_reset_email.html 2016-03-16 10:25:56 +0000
+++ templates/registration/password_reset_email.html 2019-03-06 16:38:16 +0000
@@ -4,7 +4,7 @@
44
5{% trans "Please go to the following page and choose a new password:" %}5{% trans "Please go to the following page and choose a new password:" %}
6{% block reset_link %}6{% block reset_link %}
7{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb64=uid, token=token %}7{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
8{% endblock %}8{% endblock %}
9{% trans "Your username, in case you've forgotten:" %} {{ user.username }}9{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
1010
1111
=== renamed file 'templates/registration/password_reset_email.txt' => 'templates/registration/password_reset_email.txt'
=== renamed file 'templates/registration/password_reset_form.html' => 'templates/registration/password_reset_form.html'
--- templates/registration/password_reset_form.html 2018-10-14 13:24:15 +0000
+++ templates/registration/password_reset_form.html 2019-03-06 16:38:16 +0000
@@ -1,4 +1,4 @@
1{% extends "registration/base.html" %}1{% extends "mainpage/base.html" %}
2{% comment %}2{% comment %}
3vim:ft=htmldjango: 3vim:ft=htmldjango:
4{% endcomment %}4{% endcomment %}
55
=== modified file 'templates/star_rating/rate.html'
--- templates/star_rating/rate.html 2018-11-18 17:02:53 +0000
+++ templates/star_rating/rate.html 2019-03-06 16:38:16 +0000
@@ -5,7 +5,7 @@
5{% if not user.is_authenticated and not anonymous_ratings and not read_only %}5{% if not user.is_authenticated and not anonymous_ratings and not read_only %}
6 <p>6 <p>
7 {{ rating.average|floatformat:"-2" }} ({{ rating.count }} Vote{{ rating.count|pluralize }})7 {{ rating.average|floatformat:"-2" }} ({{ rating.count }} Vote{{ rating.count|pluralize }})
8 <a href="{% url 'auth_login' %}?next={{ request.path }}">{% trans 'Please log in to vote.' %}</a>8 <a href="{% url 'login' %}?next={{ request.path }}">{% trans 'Please log in to vote.' %}</a>
9 </p>9 </p>
10{% else %}10{% else %}
11 {% block rating_user %}11 {% block rating_user %}
1212
=== modified file 'threadedcomments/templates/threadedcomments/inlines/comments.html'
--- threadedcomments/templates/threadedcomments/inlines/comments.html 2018-09-19 18:08:39 +0000
+++ threadedcomments/templates/threadedcomments/inlines/comments.html 2019-03-06 16:38:16 +0000
@@ -52,7 +52,7 @@
52 </form>52 </form>
53 {% else %}53 {% else %}
54 <p>54 <p>
55 <a href="{% url 'auth_login' %}?next={{ request.path }}">Log in</a> to post comments!55 <a href="{% url 'login' %}?next={{ request.path }}">Log in</a> to post comments!
56 </p>56 </p>
57 {% endif %}57 {% endif %}
5858
5959
=== modified file 'urls.py'
--- urls.py 2018-11-18 11:36:26 +0000
+++ urls.py 2019-03-06 16:38:16 +0000
@@ -7,7 +7,7 @@
7from django.views.generic.base import RedirectView7from django.views.generic.base import RedirectView
8from django.views.generic import TemplateView8from django.views.generic import TemplateView
9from django.contrib.syndication.views import Feed9from django.contrib.syndication.views import Feed
10from registration.backends.hmac.views import RegistrationView10from django_registration.backends.activation.views import RegistrationView
11from mainpage.forms import RegistrationWithCaptchaForm11from mainpage.forms import RegistrationWithCaptchaForm
1212
1313
@@ -23,8 +23,8 @@
23 # Django builtin / Registration23 # Django builtin / Registration
24 # overwrite registration with own implementation24 # overwrite registration with own implementation
25 url(r'^accounts/register/$', RegistrationView.as_view(25 url(r'^accounts/register/$', RegistrationView.as_view(
26 form_class=RegistrationWithCaptchaForm), name='registration_register'),26 form_class=RegistrationWithCaptchaForm), name='django_registration_register'),
27 url(r'^accounts/', include('registration.backends.hmac.urls')),27 url(r'^accounts/', include('django_registration.backends.activation.urls')),
28 url('^', include('django.contrib.auth.urls')),28 url('^', include('django.contrib.auth.urls')),
2929
30 url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),30 url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),
3131
=== modified file 'wlprofile/templates/wlprofile/edit_profile.html'
--- wlprofile/templates/wlprofile/edit_profile.html 2018-10-09 18:23:07 +0000
+++ wlprofile/templates/wlprofile/edit_profile.html 2019-03-06 16:38:16 +0000
@@ -48,7 +48,7 @@
4848
49 <h2>Other options:</h2>49 <h2>Other options:</h2>
50 <ul>50 <ul>
51 <li><a href="{% url 'auth_password_change' %}">Change website password</a></li>51 <li><a href="{% url 'password_change' %}">Change website password</a></li>
52 <li><a href="{% url 'wlggz_changepw' %}">Change online gaming password</a></li>52 <li><a href="{% url 'wlggz_changepw' %}">Change online gaming password</a></li>
53 <li><a href="{% url 'delete_me' %}">Delete me</a></li>53 <li><a href="{% url 'delete_me' %}">Delete me</a></li>
54 </ul>54 </ul>

Subscribers

People subscribed via source and target branches