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

Proposed by kaputtnik
Status: Merged
Merged at revision: 543
Proposed branch: lp:~widelands-dev/widelands-website/update_third_party_2019
Merge into: lp:widelands-website
Diff against target: 52 lines (+9/-11)
2 files modified
documentation/management/commands/create_docs.py (+1/-1)
pip_requirements.txt (+8/-10)
To merge this branch: bzr merge lp:~widelands-dev/widelands-website/update_third_party_2019
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+369747@code.launchpad.net

Commit message

Update third party apps

Description of the change

Security release for Django: https://www.djangoproject.com/weblog/2019/jul/01/security-releases/

Because i was on it, i have also updated all other apps.

Two packages removed, because i can't find any reference to them:

untokenize
pyparsing

The change in create_docs (using os.path.lexists instead of exists) fixes an issue if the link is broken (os.path.exists returns False then).

To get this in:

- set maintenance: systemctl stop wl-website
- pip install -r pip requirements.txt
- unset maintenance: systemctl start wl-website
- pip uninstall untokenize pyparsing

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

LGTM :)

review: Approve
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
=== modified file 'documentation/management/commands/create_docs.py'
--- documentation/management/commands/create_docs.py 2019-04-11 15:06:09 +0000
+++ documentation/management/commands/create_docs.py 2019-07-05 07:13:44 +0000
@@ -55,7 +55,7 @@
55 # only needed on first run55 # only needed on first run
56 os.mkdir(target_dir)56 os.mkdir(target_dir)
5757
58 if os.path.exists(link_name):58 if os.path.lexists(link_name):
59 # only needed if this script has already run59 # only needed if this script has already run
60 os.remove(link_name)60 os.remove(link_name)
6161
6262
=== modified file 'pip_requirements.txt'
--- pip_requirements.txt 2019-03-06 16:37:05 +0000
+++ pip_requirements.txt 2019-07-05 07:13:44 +0000
@@ -1,27 +1,25 @@
1# Python requirements for widelands-website at 22.06.20171# Python requirements for widelands-website at July 2019
22
3beautifulsoup4==4.7.13beautifulsoup4==4.7.1
4bleach==3.1.04bleach==3.1.0
5Django==1.11.205Django==1.11.22
6django-haystack==2.8.16django-haystack==2.8.1
7# django-messages is very old on pypi7# django-messages is very old on pypi
8# Do not install newer versions because our notifications app is affected8# Do not install newer versions because our notifications app is affected
9-e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages9-e git://github.com/arneb/django-messages.git@2d8dabb755e0b5ace876bde25f45d07c2051ac37#egg=django_messages
10django-nocaptcha-recaptcha==0.0.2010django-nocaptcha-recaptcha==0.0.20
11django-star-ratings==0.7.011django-star-ratings==0.8.0
12dj-pagination==2.4.012dj-pagination==2.4.0
13django-registration==3.013django-registration==3.0.1
14django-tagging==0.4.614django-tagging==0.4.6
15gunicorn==19.9.015gunicorn==19.9.0
16lxml==4.3.216lxml==4.3.2
17Markdown==3.0.117Markdown==3.1.1
18mysqlclient==1.4.2.post118mysqlclient==1.4.2.post1
19numpy==1.16.219numpy==1.16.4
20Pillow==5.4.120Pillow==6.1.0
21pydot==1.4.121pydot==1.4.1
22pyparsing==2.3.122Sphinx==2.1.2
23Sphinx==1.8.4
24untokenize==0.1.1
25Whoosh==2.7.423Whoosh==2.7.4
2624
27# Automatically installed dependencies25# Automatically installed dependencies

Subscribers

People subscribed via source and target branches