widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands-website/update_third_party_apps into lp:widelands-website.

Commit message:
Updated pip_requirements.txt

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1762164 in Widelands Website: "Update website code to use python 3.x"
  https://bugs.launchpad.net/widelands-website/+bug/1762164

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/update_third_party_apps/+merge/364024

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
unset maintenance
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/update_third_party_apps into lp:widelands-website.

=== modified file 'local_settings.py.sample'
--- local_settings.py.sample	2018-11-26 19:10:39 +0000
+++ local_settings.py.sample	2019-03-06 08:13:58 +0000
@@ -37,10 +37,9 @@
    }
 }
 
-# The following are just dummy values, but needed defined
-# To use the registration you have to create an API key pair
-# See https://developers.google.com/recaptcha/docs/start
-# You have to use 'localhost' as Domain
+# If you want to test the registration, you will need this keys. For testing
+# purposes, grab the values from:
+# https://developers.google.com/recaptcha/docs/faq#id-like-to-run-automated-tests-with-recaptcha-v2-what-should-i-do
 NORECAPTCHA_SITE_KEY = 'dummy'
 NORECAPTCHA_SECRET_KEY = 'dummy'
 

=== modified file 'mainpage/forms.py'
--- mainpage/forms.py	2018-09-04 18:17:07 +0000
+++ mainpage/forms.py	2019-03-06 08:13:58 +0000
@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 from django import forms
-from registration.forms import RegistrationForm
+from django_registration.forms import RegistrationForm
 from nocaptcha_recaptcha.fields import NoReCaptchaField
 from wlprofile.models import Profile as wlprofile
 

=== 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 08:13:58 +0000
@@ -40,9 +40,9 @@
 			<br />
 			<a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>
 			<br />
-			<a href="{% url 'auth_logout' %}?next=/">Logout</a>
+			<a href="{% url 'logout' %}?next=/">Logout</a>
 		{% else %}
-			<a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Login/Register</a>
+			<a href="{% url 'login' %}?next={{ request.path|iriencode }}">Login/Register</a>
 		{% endif %}
 	</li>
 </ul>

=== 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 08:13:58 +0000
@@ -40,7 +40,7 @@
 				</form>
 			{% endif %}
 		{% else %}
-			<p class="small"><a href="{% url 'auth_login' %}?next={{ request.path|iriencode }}">Log in</a> to vote!</p>
+			<p class="small"><a href="{% url 'login' %}?next={{ request.path|iriencode }}">Log in</a> to vote!</p>
 			<div class="center">
 				<input type="button" value="Results" onclick="location='{% url 'wlpoll_detail' p.id %}'" />
 			</div>

=== modified file 'pip_requirements.txt'
--- pip_requirements.txt	2018-11-19 17:19:29 +0000
+++ pip_requirements.txt	2019-03-06 08:13:58 +0000
@@ -1,45 +1,48 @@
 # Python requirements for widelands-website at 22.06.2017
 
-beautifulsoup4==4.6.3
-Django==1.11.12
+beautifulsoup4==4.7.1
+bleach==3.1.0
+Django==1.11.20
 django-haystack==2.8.1
 # django-messages is very old on pypi
 # Do not install newer versions because our notifications app is affected
 -e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages
-django-nocaptcha-recaptcha==0.0.19
+django-nocaptcha-recaptcha==0.0.20
 django-star-ratings==0.7.0
-dj-pagination==2.3.2
-django-registration==2.4.1
-django-tagging==0.4.5
-gunicorn==19.7.1
-lxml==4.2.5
-Markdown==2.6.8
-mysqlclient==1.3.10
-numpy==1.13.0
-Pillow==4.1.1
-pydot==1.2.3
-pyparsing==2.2.0
-Sphinx==1.6.2
+dj-pagination==2.4.0
+django-registration==3.0
+django-tagging==0.4.6
+gunicorn==19.9.0
+lxml==4.3.2
+Markdown==3.0.1
+mysqlclient==1.4.2.post1
+numpy==1.16.2
+Pillow==5.4.1
+pydot==1.4.1
+pyparsing==2.3.1
+Sphinx==1.8.4
 untokenize==0.1.1
-bleach==2.0.0
 Whoosh==2.7.4
 
-# Dependencies for Sphinx (automatically installed):
-# snowballstemmer==1.2.1
-# alabaster==0.7.10
-# sphinxcontrib-websupport==1.0.1
-# Pygments==2.2.0
-# requests==2.18.1, installs: idna, urllib3, chardet, certifi
-# Babel==2.4.0, installs: pytz
-# docutils==0.13.1
-# Jinja2==2.9.6, installs: MarkupSafe
-# typing==3.6.1
-# imagesize==0.7.1
-# six==1.10.0
-
-# Dependencies for bleach (automatically installed):
-# six
-# html5lib==0.999999999, installs: six, setuptools, webencodings
-
-# Dependencies for Pillow (automatically installed):
-# olefile==0.44
+# Automatically installed dependencies
+# Dependencies for django-regitration:
+    # confusable-homoglyphs=3.0
+# Dependencies for Sphinx:
+    # snowballstemmer==1.2.1
+    # alabaster==0.7.10
+    # sphinxcontrib-websupport==1.0.1
+    # Pygments==2.2.0
+    #  requests==2.18.1, installs: idna, urllib3, chardet, certifi
+    # Babel==2.4.0, installs: pytz
+    # docutils==0.13.1
+    # Jinja2==2.9.6, installs: MarkupSafe
+    # typing==3.6.1
+    # imagesize==0.7.1
+    # six==1.10.0
+    # packaging==19.0
+
+# Depencies for beautifulsoup:
+    # soupsieve==1.8, installs backports.functools-lru-cache
+
+# Dependencies for bleach:
+    # six

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "django_registration/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}
@@ -15,7 +15,7 @@
 <div class="blogEntry">
 	<p class="errormessage">
 		An error occured: Either this account has already been activated or activation key is invalid.<br />
-		Try <a href="{% url 'auth_login' %}">logging in</a>.
+		Try <a href="{% url 'login' %}">logging in</a>.
 	</p>
 </div>
 {% endblock %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}
@@ -14,7 +14,7 @@
 {% block content_main %}
 <div class="blogEntry">
 	<p>
-		You are now activated and can <a href="{% url 'auth_login' %}">log in</a>.
+		You are now activated and can <a href="{% url 'login' %}">log in</a>.
 	</p>
 </div>
 {% endblock %}

=== 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 08:13:58 +0000
@@ -3,7 +3,7 @@
 You (or someone else) requested an account on {{ site }}. If this wasn't you, 
 please ignore this email. If this was you, please click on the link provided below
 
-http://{{ site }}{% url 'registration_activate' activation_key %}
+http://{{ site }}{% url 'django_registration_activate' activation_key %}
 
 
 This link will be valid for {{ expiration_days }} days...

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "django_registration/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 
 {% block title %}
 Login - {{ block.super }}
@@ -40,6 +40,6 @@
 		<input type="submit" value="login" />
 		<input type="hidden" name="next" value="{{ next }}" />
 	</form>
-	<p><a href="{% url 'auth_password_reset' %}">Lost password?</a> | <a href="{% url 'registration_register' %}">Register now!</a></p>
+	<p><a href="{% url 'password_reset' %}">Lost password?</a> | <a href="{% url 'django_registration_register' %}">Register now!</a></p>
 </div>
 {% endblock %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 
 {% block title %}
 Logout - {{ block.super }}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}
@@ -16,7 +16,7 @@
 {% block content_main %}
 <div class="blogEntry">
 	<p>
-		Your new password has been set. You may go ahead and <a href="{% url 'auth_login' %}">log in</a> now.
+		Your new password has been set. You may go ahead and <a href="{% url 'login' %}">log in</a> now.
 	</p>
 </div>
 {% endblock %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -4,7 +4,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb64=uid, token=token %}
+{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
 

=== 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 08:13:58 +0000
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "mainpage/base.html" %}
 {% comment %}
 vim:ft=htmldjango: 
 {% endcomment %}

=== 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 08:13:58 +0000
@@ -5,7 +5,7 @@
 {% if not user.is_authenticated and not anonymous_ratings and not read_only %}
     <p>
         {{ rating.average|floatformat:"-2" }} ({{ rating.count }} Vote{{ rating.count|pluralize }})
-        <a href="{% url 'auth_login' %}?next={{ request.path }}">{% trans 'Please log in to vote.' %}</a>
+        <a href="{% url 'login' %}?next={{ request.path }}">{% trans 'Please log in to vote.' %}</a>
     </p>
 {% else %}
     {% block rating_user %}

=== 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 08:13:58 +0000
@@ -52,7 +52,7 @@
 	</form>
 	{% else %}
 	<p>
-		<a href="{% url 'auth_login' %}?next={{ request.path }}">Log in</a> to post comments!
+		<a href="{% url 'login' %}?next={{ request.path }}">Log in</a> to post comments!
 	</p>
 	{% endif %}
 

=== modified file 'urls.py'
--- urls.py	2018-11-18 11:36:26 +0000
+++ urls.py	2019-03-06 08:13:58 +0000
@@ -7,7 +7,7 @@
 from django.views.generic.base import RedirectView
 from django.views.generic import TemplateView
 from django.contrib.syndication.views import Feed
-from registration.backends.hmac.views import RegistrationView
+from django_registration.backends.activation.views import RegistrationView
 from mainpage.forms import RegistrationWithCaptchaForm
 
 
@@ -23,8 +23,8 @@
     # Django builtin / Registration
     # overwrite registration with own implementation
     url(r'^accounts/register/$', RegistrationView.as_view(
-        form_class=RegistrationWithCaptchaForm), name='registration_register'),
-    url(r'^accounts/', include('registration.backends.hmac.urls')),
+        form_class=RegistrationWithCaptchaForm), name='django_registration_register'),
+    url(r'^accounts/', include('django_registration.backends.activation.urls')),
     url('^', include('django.contrib.auth.urls')),
 
     url(r'^ratings/', include('star_ratings.urls', namespace='ratings', app_name='ratings')),

=== 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 08:13:58 +0000
@@ -48,7 +48,7 @@
 
 	<h2>Other options:</h2>
 	<ul>
-		<li><a href="{% url 'auth_password_change' %}">Change website password</a></li>
+		<li><a href="{% url 'password_change' %}">Change website password</a></li>
 		<li><a href="{% url 'wlggz_changepw' %}">Change online gaming password</a></li>
 		<li><a href="{% url 'delete_me' %}">Delete me</a></li>
 	</ul>