widelands-dev team mailing list archive

[Shevonar <infomh@xxxxxxxxxxx>]

Shevonar has proposed merging lp:~shevonar/widelands-website/django1.4 into lp:widelands-website.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~shevonar/widelands-website/django1.4/+merge/143219

I updated Django and all other requirements to newer versions when it was not to much work to migrate to the new version. So some requirements might not be up-to-date, e.g. sphinx-doc which we might not even use in the future.

I fixed all problems I found until now. Please test the new setup on http://wl.shevonar.com to find all remaining bugs. I had no time to test it in depth yet.
-- 
https://code.launchpad.net/~shevonar/widelands-website/django1.4/+merge/143219
Your team Widelands Developers is requested to review the proposed merge of lp:~shevonar/widelands-website/django1.4 into lp:widelands-website.

=== modified file 'news/feeds.py'
--- news/feeds.py	2011-08-24 13:09:49 +0000
+++ news/feeds.py	2013-01-15 01:15:26 +0000
@@ -1,7 +1,6 @@
-from django.contrib.syndication.feeds import FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.sites.models import Site
-from django.contrib.syndication.feeds import Feed
 from django.core.urlresolvers import reverse
 from widelands.news.models import Post, Category
 

=== modified file 'pip_requirements.txt'
--- pip_requirements.txt	2011-11-13 15:04:36 +0000
+++ pip_requirements.txt	2013-01-15 01:15:26 +0000
@@ -1,20 +1,20 @@
-Django==1.3.1
-wsgiref==0.1.2
--e git://github.com/dcramer/django-sphinx.git#egg=djangosphinx
-docutils==0.7
-PIL==1.1.7
--e svn+http://django-pagination.googlecode.com/svn/trunk/#egg=pagination
--e hg+https://django-tracking.googlecode.com/hg/#egg=tracking
--e git://gitorious.org/python-markdown/mainline.git#egg=markdown
-BeautifulSoup==3.2
--e hg+http://bitbucket.org/ubernostrum/django-registration/#egg=registration
--e svn+http://django-tagging.googlecode.com/svn/trunk/#egg=tagging
--e git://github.com/dcramer/django-ratings.git#egg=djangoratings
-django-threadedcomments==0.5.2
--e svn+http://django-messages.googlecode.com/svn/trunk/#egg=django_messages
--e git://github.com/jtauber/django-notification.git@3f023adf0ce2eafcee744904e2c358792f253721#egg=notification
-django-sphinxdoc==0.3.2
-South==0.7.3
-numpy
-pydot
-ipython
+Django==1.4.3
+wsgiref==0.1.2
+django-sphinx==2.2.4
+docutils==0.10
+PIL==1.1.7
+django-pagination==1.0.7
+django-tracking==0.4.1
+-e git://github.com/waylan/Python-Markdown.git#egg=Markdown
+BeautifulSoup==3.2.1
+django-registration==0.8
+django-tagging==0.3.1
+django-ratings==0.3.7
+django-threadedcomments==0.5.3
+-e git://github.com/mirumee/django-messages.git#egg=django_messages
+-e git://github.com/matiasherranz/django-notification.git@5bc9494785cfb65a5ef04d23daf53e1b6aa3cccc#egg=django-notification
+django-sphinxdoc==0.3.2
+South==0.7.4
+numpy
+pydot
+ipython
\ No newline at end of file

=== modified file 'pybb/feeds.py'
--- pybb/feeds.py	2010-06-13 12:46:44 +0000
+++ pybb/feeds.py	2013-01-15 01:15:26 +0000
@@ -1,4 +1,4 @@
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist

=== modified file 'pybb/urls.py'
--- pybb/urls.py	2012-04-19 19:46:21 +0000
+++ pybb/urls.py	2013-01-15 01:15:26 +0000
@@ -13,7 +13,7 @@
     url('^$', views.index, name='pybb_index'),
     url('^category/(?P<category_id>\d+)/$', views.show_category, name='pybb_category'),
     url('^forum/(?P<forum_id>\d+)/$', views.show_forum, name='pybb_forum'),
-    url('^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
+    url('^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.Feed',
         {'feed_dict': feeds}, name='pybb_feed'),
 
     # Topic

=== modified file 'settings.py'
--- settings.py	2012-05-17 19:28:39 +0000
+++ settings.py	2013-01-15 01:15:26 +0000
@@ -69,6 +69,7 @@
     'django.middleware.gzip.GZipMiddleware', # Remove this, when load gets to high or attachments are enabled
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'pagination.middleware.PaginationMiddleware',
@@ -220,6 +221,7 @@
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
+    'django.contrib.messages',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.markup',

=== modified file 'urls.py'
--- urls.py	2012-05-17 19:28:39 +0000
+++ urls.py	2013-01-15 01:15:26 +0000
@@ -24,7 +24,7 @@
     # overwrite registration with own implementation
     url (r'^accounts/register/$', 'mainpage.views.register', name='registration_register'),
     (r'^accounts/', include('registration.backends.default.urls')),
-    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.Feed', {'feed_dict': feeds}),
 
     # 3rd party, unmodified
     (r'^notification/', include('notification.urls')),

=== modified file 'wiki/feeds.py'
--- wiki/feeds.py	2010-06-13 12:46:44 +0000
+++ wiki/feeds.py	2013-01-15 01:15:26 +0000
@@ -1,4 +1,4 @@
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist

=== modified file 'wiki/views.py'
--- wiki/views.py	2012-09-20 20:03:21 +0000
+++ wiki/views.py	2013-01-15 01:15:26 +0000
@@ -11,7 +11,7 @@
 from django.shortcuts import get_object_or_404, render_to_response, redirect
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.syndication.feeds import FeedDoesNotExist
+from django.contrib.syndication.views import FeedDoesNotExist
 
 from wiki.forms import ArticleForm
 from wiki.models import Article, ChangeSet, dmp