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

Proposed by kaputtnik
Status: Merged
Merged at revision: 463
Proposed branch: lp:~widelands-dev/widelands-website/update_third_party_2017
Merge into: lp:widelands-website
Diff against target: 68 lines (+37/-22)
1 file modified
pip_requirements.txt (+37/-22)
To merge this branch: bzr merge lp:~widelands-dev/widelands-website/update_third_party_2017
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+326188@code.launchpad.net

Description of the change

Updating third party apps for the website. This could easily done by running

pip install -r pip_requirements.txt

This will uninstall found older versions of the python apps an installs the new versions specified in pip_requirements.txt

After the command has finished, the command

./manage.py migrate

has to be executed, because the tagging app has a new migration.

Testing this changes at home works fine, but i have applied the changes to the alpha site to be sure there is no issue. Please test.

@GunChleoc: Please test also the 'unread' issue on the alpha site

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

2 packages are gone from the list (see comment) - it this intentional?

Revision history for this message
GunChleoc (gunchleoc) wrote :

I have tested new posts, edited a complex wikipage and sent myself a PM - seems all OK.

Revision history for this message
kaputtnik (franku) wrote :

Thanks for testing :-)

Docutils and MarkupSafe get automatically installed when
Sphinx get installed. See the additional Comments "# Dependencies..."

I just wanted to clear it up what is really needed and what are dependencies from third party apps.

But i will additionally grep through the code to see which app is really needed by our website code. Maybe over the time there where some apps added which aren't needed anymore.

464. By kaputtnik

removed django-appconf from pip_requirements.txt, don't know anymore why it was in there

Revision history for this message
kaputtnik (franku) wrote :

I have removed django_appconf. This was inserted when upgrading to django 1.8, but i don't know anymore why it get inserted.

I have also updated the encyclopedia on the alpha site and all works fine.

The only issue i found: When searching for e.g. 'barbarians' there are no entries in the results for the encyclopedia. I guess that's happen because the search index isn't updated for the alpha site.

I have tested the removing of django-appconf at home and also on the alpha site. Looks good to me.

Alpha site is stopped now. I will wait a week and deploy this then on the production site ...

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

I am wondering whether this project is a good candidate for moving to GitHub, because they have this:

https://requires.io/github/translate/pootle/requirements/?branch=master

I'm not confident enough with git yet to manage Widelands on it, but since this project is smaller, it will be easier to handle.

Revision history for this message
kaputtnik (franku) wrote :

Yes i talked about moving to github with SirVer and he mentioned the biggest problem is to move also the bugs list. Then i talked with janus and proposed him the idea to move the website stuff, just like you mentioned. But there where no progress on this idea.

Nice possibility shown in your link :-)

Revision history for this message
kaputtnik (franku) wrote :

merged and deployed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pip_requirements.txt'
2--- pip_requirements.txt 2017-01-21 12:39:23 +0000
3+++ pip_requirements.txt 2017-06-23 21:35:21 +0000
4@@ -1,27 +1,42 @@
5+# Python requirements for widelands-website at 22.06.2017
6+
7 BeautifulSoup==3.2.0
8 Django==1.8
9-django-appconf==1.0.1
10-django-contrib-comments==1.6.2
11+django-contrib-comments==1.8.0
12 django-messages==0.5.3
13 django-nocaptcha-recaptcha==0.0.19
14-# next is a more updated version of linaro-django-pagination
15--e git://github.com/zyga/django-pagination.git#egg=linaro-django-pagination
16-django-registration==2.0.4
17-django-tagging==0.4.1
18-docutils==0.12
19-gunicorn==19.4.5
20-Jinja2==2.8
21-Markdown==2.6.5
22-MarkupSafe==0.23
23-mysqlclient==1.3.7
24-numpy==1.10.4
25-Pillow==3.1.1
26-pydot==1.1.0
27-Pygments==2.1.3
28-pyparsing==2.1.4
29-six==1.10.0
30-Sphinx==1.4.5
31+-e git://github.com/zyga/django-pagination.git@86caf150984733eb5a0bb07af26cd8fc0a8d8496#egg=linaro_django_pagination
32+django-registration==2.2
33+django-tagging==0.4.5
34+gunicorn==19.7.1
35+Markdown==2.6.8
36+mysqlclient==1.3.10
37+numpy==1.13.0
38+Pillow==4.1.1
39+pydot==1.2.3
40+pyparsing==2.2.0
41+Sphinx==1.6.2
42 untokenize==0.1.1
43--e git://github.com/kerin/django-sphinx.git#egg=django-sphinx
44-bleach==1.4.3
45-
46+-e git://github.com/kerin/django-sphinx.git@1c5ef8abcf86f9a9458f763ceb9e5d882247ea37#egg=django_sphinx
47+bleach==2.0.0
48+
49+
50+# Dependencies for Sphinx (automatically installed):
51+# snowballstemmer==1.2.1
52+# alabaster==0.7.10
53+# sphinxcontrib-websupport==1.0.1
54+# Pygments==2.2.0
55+# requests==2.18.1, installs: idna, urllib3, chardet, certifi
56+# Babel==2.4.0, installs: pytz
57+# docutils==0.13.1
58+# Jinja2==2.9.6, installs: MarkupSafe
59+# typing==3.6.1
60+# imagesize==0.7.1
61+# six==1.10.0
62+
63+# Dependencies for bleach (automatically installed):
64+# six
65+# html5lib==0.999999999, installs: six, setuptools, webencodings
66+
67+# Dependencies for Pillow (automatically installed):
68+# olefile==0.44

Subscribers

People subscribed via source and target branches