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
1=== modified file 'local_settings.py.sample'
2--- local_settings.py.sample 2018-11-26 19:10:39 +0000
3+++ local_settings.py.sample 2019-03-06 16:38:16 +0000
4@@ -37,10 +37,9 @@
5 }
6 }
7
8-# The following are just dummy values, but needed defined
9-# To use the registration you have to create an API key pair
10-# See https://developers.google.com/recaptcha/docs/start
11-# You have to use 'localhost' as Domain
12+# If you want to test the registration, you will need these keys.
13+# For testing purposes, grab the values from:
14+# https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha-v2-what-should-i-do
15 NORECAPTCHA_SITE_KEY = 'dummy'
16 NORECAPTCHA_SECRET_KEY = 'dummy'
17
18
19=== modified file 'mainpage/forms.py'
20--- mainpage/forms.py 2018-09-04 18:17:07 +0000
21+++ mainpage/forms.py 2019-03-06 16:38:16 +0000
22@@ -2,7 +2,7 @@
23 # encoding: utf-8
24
25 from django import forms
26-from registration.forms import RegistrationForm
27+from django_registration.forms import RegistrationForm
28 from nocaptcha_recaptcha.fields import NoReCaptchaField
29 from wlprofile.models import Profile as wlprofile
30
31
32=== modified file 'mainpage/templates/mainpage/header.html'
33--- mainpage/templates/mainpage/header.html 2019-01-24 18:03:54 +0000
34+++ mainpage/templates/mainpage/header.html 2019-03-06 16:38:16 +0000
35@@ -40,9 +40,9 @@
36 <br />
37 <a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>
38 <br />
39- <a href="{% url 'auth_logout' %}?next=/">Logout</a>
40+ <a href="{% url 'logout' %}?next=/">Logout</a>
41 {% else %}
42- <a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Login/Register</a>
43+ <a href="{% url 'login' %}?next={{ request.path|iriencode }}">Login/Register</a>
44 {% endif %}
45 </li>
46 </ul>
47
48=== modified file 'mainpage/templates/mainpage/right_boxes.html'
49--- mainpage/templates/mainpage/right_boxes.html 2019-01-24 18:03:54 +0000
50+++ mainpage/templates/mainpage/right_boxes.html 2019-03-06 16:38:16 +0000
51@@ -40,7 +40,7 @@
52 </form>
53 {% endif %}
54 {% else %}
55- <p class="small"><a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Log in</a> to vote!</p>
56+ <p class="small"><a href="{% url 'login' %}?next={{ request.path|iriencode }}">Log in</a> to vote!</p>
57 <div class="center">
58 <input type="button" value="Results" onclick="location='{% url 'wlpoll_detail' p.id %}'" />
59 </div>
60
61=== modified file 'pip_requirements.txt'
62--- pip_requirements.txt 2018-11-19 17:19:29 +0000
63+++ pip_requirements.txt 2019-03-06 16:38:16 +0000
64@@ -1,45 +1,50 @@
65 # Python requirements for widelands-website at 22.06.2017
66
67-beautifulsoup4==4.6.3
68-Django==1.11.12
69+beautifulsoup4==4.7.1
70+bleach==3.1.0
71+Django==1.11.20
72 django-haystack==2.8.1
73 # django-messages is very old on pypi
74 # Do not install newer versions because our notifications app is affected
75 -e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages
76-django-nocaptcha-recaptcha==0.0.19
77+django-nocaptcha-recaptcha==0.0.20
78 django-star-ratings==0.7.0
79-dj-pagination==2.3.2
80-django-registration==2.4.1
81-django-tagging==0.4.5
82-gunicorn==19.7.1
83-lxml==4.2.5
84-Markdown==2.6.8
85-mysqlclient==1.3.10
86-numpy==1.13.0
87-Pillow==4.1.1
88-pydot==1.2.3
89-pyparsing==2.2.0
90-Sphinx==1.6.2
91+dj-pagination==2.4.0
92+django-registration==3.0
93+django-tagging==0.4.6
94+gunicorn==19.9.0
95+lxml==4.3.2
96+Markdown==3.0.1
97+mysqlclient==1.4.2.post1
98+numpy==1.16.2
99+Pillow==5.4.1
100+pydot==1.4.1
101+pyparsing==2.3.1
102+Sphinx==1.8.4
103 untokenize==0.1.1
104-bleach==2.0.0
105 Whoosh==2.7.4
106
107-# Dependencies for Sphinx (automatically installed):
108-# snowballstemmer==1.2.1
109-# alabaster==0.7.10
110-# sphinxcontrib-websupport==1.0.1
111-# Pygments==2.2.0
112-# requests==2.18.1, installs: idna, urllib3, chardet, certifi
113-# Babel==2.4.0, installs: pytz
114-# docutils==0.13.1
115-# Jinja2==2.9.6, installs: MarkupSafe
116-# typing==3.6.1
117-# imagesize==0.7.1
118-# six==1.10.0
119-
120-# Dependencies for bleach (automatically installed):
121-# six
122-# html5lib==0.999999999, installs: six, setuptools, webencodings
123-
124-# Dependencies for Pillow (automatically installed):
125-# olefile==0.44
126+# Automatically installed dependencies
127+
128+# Dependencies for django-registration:
129+ # confusable-homoglyphs=3.0
130+
131+# Dependencies for Sphinx:
132+ # snowballstemmer==1.2.1
133+ # alabaster==0.7.10
134+ # sphinxcontrib-websupport==1.0.1
135+ # Pygments==2.2.0
136+ # requests==2.18.1, installs: idna, urllib3, chardet, certifi
137+ # Babel==2.4.0, installs: pytz
138+ # docutils==0.13.1
139+ # Jinja2==2.9.6, installs: MarkupSafe
140+ # typing==3.6.1
141+ # imagesize==0.7.1
142+ # six==1.10.0
143+ # packaging==19.0
144+
145+# Depencies for beautifulsoup:
146+ # soupsieve==1.8, installs backports.functools-lru-cache
147+
148+# Dependencies for bleach:
149+ # six
150
151=== renamed directory 'templates/registration' => 'templates/django_registration'
152=== modified file 'templates/django_registration/activate.html'
153--- templates/registration/activate.html 2018-10-14 14:20:48 +0000
154+++ templates/django_registration/activate.html 2019-03-06 16:38:16 +0000
155@@ -1,4 +1,4 @@
156-{% extends "registration/base.html" %}
157+{% extends "mainpage/base.html" %}
158 {% comment %}
159 vim:ft=htmldjango:
160 {% endcomment %}
161@@ -15,7 +15,7 @@
162 <div class="blogEntry">
163 <p class="errormessage">
164 An error occured: Either this account has already been activated or activation key is invalid.<br />
165- Try <a href="{% url 'auth_login' %}">logging in</a>.
166+ Try <a href="{% url 'login' %}">logging in</a>.
167 </p>
168 </div>
169 {% endblock %}
170
171=== modified file 'templates/django_registration/activation_complete.html'
172--- templates/registration/activation_complete.html 2018-10-14 13:24:15 +0000
173+++ templates/django_registration/activation_complete.html 2019-03-06 16:38:16 +0000
174@@ -1,4 +1,4 @@
175-{% extends "registration/base.html" %}
176+{% extends "mainpage/base.html" %}
177 {% comment %}
178 vim:ft=htmldjango:
179 {% endcomment %}
180@@ -14,7 +14,7 @@
181 {% block content_main %}
182 <div class="blogEntry">
183 <p>
184- You are now activated and can <a href="{% url 'auth_login' %}">log in</a>.
185+ You are now activated and can <a href="{% url 'login' %}">log in</a>.
186 </p>
187 </div>
188 {% endblock %}
189
190=== renamed file 'templates/registration/activation_email.txt' => 'templates/django_registration/activation_email_body.txt'
191--- templates/registration/activation_email.txt 2016-03-07 20:38:39 +0000
192+++ templates/django_registration/activation_email_body.txt 2019-03-06 16:38:16 +0000
193@@ -3,7 +3,7 @@
194 You (or someone else) requested an account on {{ site }}. If this wasn't you,
195 please ignore this email. If this was you, please click on the link provided below
196
197-http://{{ site }}{% url 'registration_activate' activation_key %}
198+http://{{ site }}{% url 'django_registration_activate' activation_key %}
199
200
201 This link will be valid for {{ expiration_days }} days...
202
203=== modified file 'templates/django_registration/registration_complete.html'
204--- templates/registration/registration_complete.html 2018-10-14 13:24:15 +0000
205+++ templates/django_registration/registration_complete.html 2019-03-06 16:38:16 +0000
206@@ -1,4 +1,4 @@
207-{% extends "registration/base.html" %}
208+{% extends "mainpage/base.html" %}
209 {% comment %}
210 vim:ft=htmldjango:
211 {% endcomment %}
212
213=== modified file 'templates/django_registration/registration_form.html'
214--- templates/registration/registration_form.html 2018-10-14 13:24:15 +0000
215+++ templates/django_registration/registration_form.html 2019-03-06 16:38:16 +0000
216@@ -1,4 +1,4 @@
217-{% extends "registration/base.html" %}
218+{% extends "django_registration/base.html" %}
219 {% comment %}
220 vim:ft=htmldjango:
221 {% endcomment %}
222
223=== added directory 'templates/registration'
224=== renamed file 'templates/registration/login.html' => 'templates/registration/login.html'
225--- templates/registration/login.html 2018-10-14 13:24:15 +0000
226+++ templates/registration/login.html 2019-03-06 16:38:16 +0000
227@@ -1,4 +1,4 @@
228-{% extends "registration/base.html" %}
229+{% extends "mainpage/base.html" %}
230
231 {% block title %}
232 Login - {{ block.super }}
233@@ -40,6 +40,6 @@
234 <input type="submit" value="login" />
235 <input type="hidden" name="next" value="{{ next }}" />
236 </form>
237- <p><a href="{% url 'auth_password_reset' %}">Lost password?</a> | <a href="{% url 'registration_register' %}">Register now!</a></p>
238+ <p><a href="{% url 'password_reset' %}">Lost password?</a> | <a href="{% url 'django_registration_register' %}">Register now!</a></p>
239 </div>
240 {% endblock %}
241
242=== renamed file 'templates/registration/logout.html' => 'templates/registration/logout.html'
243--- templates/registration/logout.html 2018-11-09 07:00:30 +0000
244+++ templates/registration/logout.html 2019-03-06 16:38:16 +0000
245@@ -1,4 +1,4 @@
246-{% extends "registration/base.html" %}
247+{% extends "mainpage/base.html" %}
248
249 {% block title %}
250 Logout - {{ block.super }}
251
252=== renamed file 'templates/registration/password_change_done.html' => 'templates/registration/password_change_done.html'
253--- templates/registration/password_change_done.html 2018-10-14 13:24:15 +0000
254+++ templates/registration/password_change_done.html 2019-03-06 16:38:16 +0000
255@@ -1,4 +1,4 @@
256-{% extends "registration/base.html" %}
257+{% extends "mainpage/base.html" %}
258 {% comment %}
259 vim:ft=htmldjango:
260 {% endcomment %}
261
262=== renamed file 'templates/registration/password_change_form.html' => 'templates/registration/password_change_form.html'
263--- templates/registration/password_change_form.html 2018-10-14 13:24:15 +0000
264+++ templates/registration/password_change_form.html 2019-03-06 16:38:16 +0000
265@@ -1,4 +1,4 @@
266-{% extends "registration/base.html" %}
267+{% extends "mainpage/base.html" %}
268 {% comment %}
269 vim:ft=htmldjango:
270 {% endcomment %}
271
272=== renamed file 'templates/registration/password_reset_complete.html' => 'templates/registration/password_reset_complete.html'
273--- templates/registration/password_reset_complete.html 2018-10-14 13:24:15 +0000
274+++ templates/registration/password_reset_complete.html 2019-03-06 16:38:16 +0000
275@@ -1,4 +1,4 @@
276-{% extends "registration/base.html" %}
277+{% extends "mainpage/base.html" %}
278 {% comment %}
279 vim:ft=htmldjango:
280 {% endcomment %}
281@@ -16,7 +16,7 @@
282 {% block content_main %}
283 <div class="blogEntry">
284 <p>
285- Your new password has been set. You may go ahead and <a href="{% url 'auth_login' %}">log in</a> now.
286+ Your new password has been set. You may go ahead and <a href="{% url 'login' %}">log in</a> now.
287 </p>
288 </div>
289 {% endblock %}
290
291=== renamed file 'templates/registration/password_reset_confirm.html' => 'templates/registration/password_reset_confirm.html'
292--- templates/registration/password_reset_confirm.html 2018-10-14 14:20:48 +0000
293+++ templates/registration/password_reset_confirm.html 2019-03-06 16:38:16 +0000
294@@ -1,4 +1,4 @@
295-{% extends "registration/base.html" %}
296+{% extends "mainpage/base.html" %}
297 {% comment %}
298 vim:ft=htmldjango:
299 {% endcomment %}
300
301=== renamed file 'templates/registration/password_reset_done.html' => 'templates/registration/password_reset_done.html'
302--- templates/registration/password_reset_done.html 2018-10-14 13:24:15 +0000
303+++ templates/registration/password_reset_done.html 2019-03-06 16:38:16 +0000
304@@ -1,4 +1,4 @@
305-{% extends "registration/base.html" %}
306+{% extends "mainpage/base.html" %}
307 {% comment %}
308 vim:ft=htmldjango:
309 {% endcomment %}
310
311=== renamed file 'templates/registration/password_reset_email.html' => 'templates/registration/password_reset_email.html'
312--- templates/registration/password_reset_email.html 2016-03-16 10:25:56 +0000
313+++ templates/registration/password_reset_email.html 2019-03-06 16:38:16 +0000
314@@ -4,7 +4,7 @@
315
316 {% trans "Please go to the following page and choose a new password:" %}
317 {% block reset_link %}
318-{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb64=uid, token=token %}
319+{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
320 {% endblock %}
321 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
322
323
324=== renamed file 'templates/registration/password_reset_email.txt' => 'templates/registration/password_reset_email.txt'
325=== renamed file 'templates/registration/password_reset_form.html' => 'templates/registration/password_reset_form.html'
326--- templates/registration/password_reset_form.html 2018-10-14 13:24:15 +0000
327+++ templates/registration/password_reset_form.html 2019-03-06 16:38:16 +0000
328@@ -1,4 +1,4 @@
329-{% extends "registration/base.html" %}
330+{% extends "mainpage/base.html" %}
331 {% comment %}
332 vim:ft=htmldjango:
333 {% endcomment %}
334
335=== modified file 'templates/star_rating/rate.html'
336--- templates/star_rating/rate.html 2018-11-18 17:02:53 +0000
337+++ templates/star_rating/rate.html 2019-03-06 16:38:16 +0000
338@@ -5,7 +5,7 @@
339 {% if not user.is_authenticated and not anonymous_ratings and not read_only %}
340 <p>
341 {{ rating.average|floatformat:"-2" }} ({{ rating.count }} Vote{{ rating.count|pluralize }})
342- <a href="{% url 'auth_login' %}?next={{ request.path }}">{% trans 'Please log in to vote.' %}</a>
343+ <a href="{% url 'login' %}?next={{ request.path }}">{% trans 'Please log in to vote.' %}</a>
344 </p>
345 {% else %}
346 {% block rating_user %}
347
348=== modified file 'threadedcomments/templates/threadedcomments/inlines/comments.html'
349--- threadedcomments/templates/threadedcomments/inlines/comments.html 2018-09-19 18:08:39 +0000
350+++ threadedcomments/templates/threadedcomments/inlines/comments.html 2019-03-06 16:38:16 +0000
351@@ -52,7 +52,7 @@
352 </form>
353 {% else %}
354 <p>
355- <a href="{% url 'auth_login' %}?next={{ request.path }}">Log in</a> to post comments!
356+ <a href="{% url 'login' %}?next={{ request.path }}">Log in</a> to post comments!
357 </p>
358 {% endif %}
359
360
361=== modified file 'urls.py'
362--- urls.py 2018-11-18 11:36:26 +0000
363+++ urls.py 2019-03-06 16:38:16 +0000
364@@ -7,7 +7,7 @@
365 from django.views.generic.base import RedirectView
366 from django.views.generic import TemplateView
367 from django.contrib.syndication.views import Feed
368-from registration.backends.hmac.views import RegistrationView
369+from django_registration.backends.activation.views import RegistrationView
370 from mainpage.forms import RegistrationWithCaptchaForm
371
372
373@@ -23,8 +23,8 @@
374 # Django builtin / Registration
375 # overwrite registration with own implementation
376 url(r'^accounts/register/$', RegistrationView.as_view(
377- form_class=RegistrationWithCaptchaForm), name='registration_register'),
378- url(r'^accounts/', include('registration.backends.hmac.urls')),
379+ form_class=RegistrationWithCaptchaForm), name='django_registration_register'),
380+ url(r'^accounts/', include('django_registration.backends.activation.urls')),
381 url('^', include('django.contrib.auth.urls')),
382
383 url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),
384
385=== modified file 'wlprofile/templates/wlprofile/edit_profile.html'
386--- wlprofile/templates/wlprofile/edit_profile.html 2018-10-09 18:23:07 +0000
387+++ wlprofile/templates/wlprofile/edit_profile.html 2019-03-06 16:38:16 +0000
388@@ -48,7 +48,7 @@
389
390 <h2>Other options:</h2>
391 <ul>
392- <li><a href="{% url 'auth_password_change' %}">Change website password</a></li>
393+ <li><a href="{% url 'password_change' %}">Change website password</a></li>
394 <li><a href="{% url 'wlggz_changepw' %}">Change online gaming password</a></li>
395 <li><a href="{% url 'delete_me' %}">Delete me</a></li>
396 </ul>

Subscribers

People subscribed via source and target branches