Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail into lp:widelands
travis fails due to sphinx not happy. should be fixed after merging trunk -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817664-overlooping-eva_fail/+merge/363679 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4531. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/499122948. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817664-overlooping-eva_fail/+merge/363679 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail into lp:widelands
Merged trunk @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817664-overlooping-eva_fail/+merge/363679 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands.
Commit message:
Fail with SDL messagebox if SDL_BYTESPERPIXEL != 4
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1817686 in widelands: "Assert fail in Graphic::initialize"
https://bugs.launchpad.net/widelands/+bug/1817686
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands.
=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc 2019-02-23 11:00:49 +
+++ src/graphic/graphic.cc 2019-02-27 14:22:14 +
@@ -114,6 +114,15 @@
" size %d %d\n"
" END GRAPHICS REPORT \n",
SDL_GetCurrentVideoDriver(), disp_mode.format, disp_mode.w, disp_mode.h);
+ const int bytes_per_pixel = SDL_BYTESPERPIXEL(disp_mode.format);
+ if (bytes_per_pixel != 4) {
+ log("ERROR: Wrong SDL_BYTESPERPIXEL, expected 4 but got %d\n", bytes_per_pixel);
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Video Error",
+ (boost::format("SDL should report 4 bytes per pixel, but %d were reported instead.\n\nPlease check that everything's OK with your graphics driver.") % bytes_per_pixel).str().c_str(),
+ nullptr);
+ exit(1);
+
+ }
assert(SDL_BYTESPERPIXEL(disp_mode.format) == 4);
}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
Tested it. The log says »ERROR: Wrong SDL_BYTESPERPIXEL, expected 4 but got 1« as expected. But no message box appears, the program exits immediately. By the way, the assert could be removed now, right? Since the triggering failure is now caught beforehand. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
I guess the driver is too messed up to even display the message box then. I have now made the log message identical to the dialog message and removed the assert. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
Review: Approve It´s a perfectly normal built-in Intel graphics card (VGA compatible controller, Atom Processor Z36xxx/Z37xxx Series Graphics & Display) with default drivers – no reason why it should behave like that, especially in such a random way. It always worked before… The code looks good to me; and if the SDL is messed up, that´s a problem with the graphics driver or possibly the SDL, but not in widelands. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
Thanks for the review and testing @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
> built-in Intel graphics card I should had bet for this :-D There were several problems with this graphics card in the past. Glad it's working for you now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail into lp:widelands
Continuous integration builds have changed state: Travis build 4533. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/499220518. Appveyor build 4320. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1817664_overlooping_eva_fail-4320. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817664-overlooping-eva_fail/+merge/363679 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1817664-overlooping-eva_fail/+merge/363679 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817664-overlooping-eva_fail. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website
kaputtnik has proposed merging lp:~widelands-dev/widelands-website/pybb_cleanup
into lp:widelands-website.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/pybb_cleanup/+merge/363742
A big cleanup on pybb:
- removed model pybb Privatemessage and all related functions since we use
Django Messages
- removed field moderators from pybb Forum, since we use django Group for this
- removed other unused functions
- removed pybb pagination and related functions since we use dj_pagination for
that
- removed option PYBB_FREEZE_FIRST_POST. This was meant to show the first post
of a topic on each sub page. We never used this and i never saw this in other
forums.
- removed some templates which were not used
Additional changes:
- added table headers 'Forum' and 'Last Post on Topic' to forum categories
- added table headers 'Forum' and 'Last Post' to topics overview
- changed appearance of the link to last post in topics overview (see
https://bugs.launchpad.net/widelands-website/+bug/1762164/comments/9)
- changed the admin site for pybb topics: Instead showing the topic
subscribers, the related posts of a topic are shown
- it is now possible to search for a topics name in the admin page for pybb post
To get this in:
make a database backup
merge the branch
run python manage.py migrate
run python mangage.py collectstatic -l
restart wlwebsite
After success, check the database: The table pybb_privatemessage may has to be
removed by hand
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website.
=== modified file 'mainpage/templates/mainpage/forum_navigation.html'
--- mainpage/templates/mainpage/forum_navigation.html 2018-12-12 13:46:48 +
+++ mainpage/templates/mainpage/forum_navigation.html 2019-02-27 20:07:53 +
@@ -8,7 +8,9 @@
{{ forum.name }}
{% else %}
- {{ forum.name }}
+
+ {{ forum.name }}
+
{% endif %}
{% endfor %}
=== modified file 'pybb/admin.py'
--- pybb/admin.py 2018-12-11 13:01:59 +
+++ pybb/admin.py 2019-02-27 20:07:53 +
@@ -44,13 +44,18 @@
(_('Additional options'), {
'description': 'Position is the position inside the category. \
This has effect on ordering in forums overview and the navigation bar.',
-'fields': ('position', 'description', 'moderators')
+'fields': ('position', 'description')
}
),
)
-
-class SubscribersInline(admin.TabularInline):
-model = Topic.subscribers.through
+
+
+class PostInline(admin.TabularInline):
+model = Post
+readonly_fields = ('user', 'markup', 'created',)
+exclude = ('created', 'updated', 'body',)
+ordering = ('-created',)
+
class TopicAdmin(admin.ModelAdmin):
list_display = ['name', 'forum', 'created', 'head', 'is_hidden']
@@ -58,6 +63,7 @@
ordering = ['-created']
date_hierarchy = 'created'
search_fields = ['name']
+inlines = [PostInline,]
fieldsets = (
(None, {
'fields': ('forum', 'name', 'user', ('created', 'updated'))
@@ -67,7 +73,6 @@
'fields': (('views',), ('sticky', 'closed'),)
}),
)
-inlines = [ SubscribersInline, ]
class PostAdmin(admin.ModelAdmin):
@@ -75,7 +80,7 @@
list_per_page = 20
ordering = ['-created']
date_hierarchy = 'created'
-search_fields = ['body']
+search_fields = ['body', 'topic__name']
actions = [delete_selected, unhide_post]
fieldsets = (
(None, {
=== modified file 'pybb/forms.py'
--- pybb/forms.py 2018-10-03 09:01:09 +
+++ pybb/forms.py 2019-02-27 20:07:53 +
@@ -7,7 +7,7 @@
from django.utils.translation import ugettext as _
from django.contrib.auth.models import User
-from pybb.models import Topic, Post, PrivateMessage, Attachment
+from pybb.models import Topic, Post, Attachment
from pybb import settings as pybb_settings
from django.conf import settings
@@ -87,14 +87,3 @@
post.updated = datetime.now()
post.save(*args, **kwargs)
return post
-
-
-class UserSearchForm(forms.Form):
-query = forms.CharField(required=False, label='')
-
-def filter(self, qs):
-if self.is_valid():
-query = self.cleaned_data['query']
-return qs.filter(username__contains=query)
-else:
-return qs
=== added file 'pybb/migrations/0005_auto_20181221_1047.py'
--- pybb/migrations/0005_auto_20181221_1047.py 1970-01-01 00:00:00 +
+++ pybb/migrations/0005_auto_20181221_1047.py 2019-02-27 20:07:53 +
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-12-21 10:47
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+dependencies = [
+('pybb', '0004_auto_20181209_1334'),
+]
+
+operations = [
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
Continuous integration builds have changed state: Travis build 4535. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/499382080. Appveyor build 4322. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1817686_SDL_pixel_format-4322. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4535. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/499382080. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1796364-blinking-buildings into lp:widelands
Continuous integration builds have changed state: Travis build 4536. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/499415843. Appveyor build 4323. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1796364_blinking_buildings-4323. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1796364-blinking-buildings/+merge/359348 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1796364-blinking-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website
Looks good to me. Can you spin up the alpha site for some testing? -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_cleanup/+merge/363742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands
travis failure is transient. (apt-get failed) @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1817686-SDL-pixel-format/+merge/363729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1796364-blinking-buildings into lp:widelands
@GunChleoc >From my side this is ready to merge. Travis is not green due to a transient >failure. But as I am not an expert for this code I'll leave the decision for merging to you -- https://code.launchpad.net/~widelands-dev/widelands/bug-1796364-blinking-buildings/+merge/359348 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1796364-blinking-buildings. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website
alpha is up :-) -- https://code.launchpad.net/~widelands-dev/widelands-website/pybb_cleanup/+merge/363742 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/pybb_cleanup into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
