Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6570F10AA7 for ; Wed, 19 Feb 2014 19:18:52 +0000 (UTC) Received: (qmail 81731 invoked by uid 500); 19 Feb 2014 19:18:51 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 81662 invoked by uid 500); 19 Feb 2014 19:18:49 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 81642 invoked by uid 99); 19 Feb 2014 19:18:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Feb 2014 19:18:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31A24928080; Wed, 19 Feb 2014 19:18:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Wed, 19 Feb 2014 19:18:50 -0000 Message-Id: <76d8f7d5d94646b9bd6fc4780ae97a28@git.apache.org> In-Reply-To: <919e87e9fe0f40a3a1ba66d6e00e80d7@git.apache.org> References: <919e87e9fe0f40a3a1ba66d6e00e80d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: [#7185] move project list conditionals from the template to the data fetching logic [#7185] move project list conditionals from the template to the data fetching logic Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4e6149d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4e6149d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4e6149d5 Branch: refs/heads/cj/7128 Commit: 4e6149d52f5e136bc47383c432610586b654c476 Parents: 09f2138 Author: Dave Brondsema Authored: Tue Feb 18 16:36:06 2014 -0500 Committer: Cory Johns Committed: Wed Feb 19 18:50:33 2014 +0000 ---------------------------------------------------------------------- Allura/allura/lib/widgets/project_list.py | 32 ++++++++------------ .../templates/widgets/project_summary.html | 12 ++++---- run_tests | 4 +-- scripts/asf-release.sh | 5 ++- 4 files changed, 22 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4e6149d5/Allura/allura/lib/widgets/project_list.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/widgets/project_list.py b/Allura/allura/lib/widgets/project_list.py index f14fba9..d89393a 100644 --- a/Allura/allura/lib/widgets/project_list.py +++ b/Allura/allura/lib/widgets/project_list.py @@ -126,33 +126,25 @@ class ProjectList(ew_core.Widget): projects = response['projects'] cred.load_user_roles(c.user._id, *[p._id for p in projects]) cred.load_project_roles(*[p._id for p in projects]) - if response['sitemaps'] is None: + + true_list = ['true', 't', '1', 'yes', 'y'] + for opt in ['show_proj_icon', 'show_download_button', 'show_awards_banner']: + if type(response[opt]) == unicode: + if response[opt].lower() in true_list: + response[opt] = True + else: + response[opt] = False + + if response['sitemaps'] is None and response['display_mode'] != 'list': response['sitemaps'] = M.Project.menus(projects) - if response['icon_urls'] is None: + if response['icon_urls'] is None and response['show_proj_icon']: response['icon_urls'] = M.Project.icon_urls(projects) - if response['accolades_index'] is None: + if response['accolades_index'] is None and response['show_awards_banner']: response['accolades_index'] = M.Project.accolades_index(projects) if type(response['columns']) == unicode: response['columns'] = int(response['columns']) - true_list = ['true', 't', '1', 'yes', 'y'] - if type(response['show_proj_icon']) == unicode: - if response['show_proj_icon'].lower() in true_list: - response['show_proj_icon'] = True - else: - response['show_proj_icon'] = False - if type(response['show_download_button']) == unicode: - if response['show_download_button'].lower() in true_list: - response['show_download_button'] = True - else: - response['show_download_button'] = False - if type(response['show_awards_banner']) == unicode: - if response['show_awards_banner'].lower() in true_list: - response['show_awards_banner'] = True - else: - response['show_awards_banner'] = False - return response def resources(self): http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4e6149d5/Allura/allura/templates/widgets/project_summary.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/widgets/project_summary.html b/Allura/allura/templates/widgets/project_summary.html index 75c9527..734ccd3 100644 --- a/Allura/allura/templates/widgets/project_summary.html +++ b/Allura/allura/templates/widgets/project_summary.html @@ -19,12 +19,12 @@ {% if display_mode == 'list' %}
- {% if accolades and show_awards_banner %} + {% if accolades %} - {% elif show_proj_icon and icon_url %} + {% elif icon_url %}
{{value.name}} Logo
@@ -35,12 +35,12 @@
{% else %}
- {% if accolades and show_awards_banner %} + {% if accolades %} - {% elif show_proj_icon and icon_url %} + {% elif icon_url %}
{{value.name}} Logo
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4e6149d5/run_tests ---------------------------------------------------------------------- diff --git a/run_tests b/run_tests index 7ae6547..9944997 100755 --- a/run_tests +++ b/run_tests @@ -30,7 +30,7 @@ import textwrap CPUS = multiprocessing.cpu_count() CONCURRENT_SUITES = (CPUS // 4) or CPUS CONCURRENT_TESTS = (CPUS // CONCURRENT_SUITES) or 1 -PROC_TIMEOUT = 120 +PROC_TIMEOUT = 180 ALT_PKG_PATHS = { 'Allura': 'allura/tests/', @@ -117,7 +117,7 @@ def run_tests_in_parallel(options, nosetests_args): return ALT_PKG_PATHS.get(pkg, '') def get_multiproc_args(pkg): - if not use_multiproc: + if not use_multiproc or options.concurrent_tests == 1: return '' return ('--processes={procs_per_suite} --process-timeout={proc_timeout}'.format( procs_per_suite=options.concurrent_tests, http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4e6149d5/scripts/asf-release.sh ---------------------------------------------------------------------- diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh index 8e6bfe3..19ac9e5 100755 --- a/scripts/asf-release.sh +++ b/scripts/asf-release.sh @@ -83,9 +83,8 @@ Hello, This is a call for a vote on Apache Allura $VERSION incubating. -Source tarball and signature are available at: - https://dist.apache.org/repos/dist/dev/incubator/allura/$RELEASE_BASE.tar.gz - https://dist.apache.org/repos/dist/dev/incubator/allura/$RELEASE_BASE.tar.gz.asc +Source tarball, signature and checksums are available at: + https://dist.apache.org/repos/dist/dev/incubator/allura/ Checksums: MD5: $MD5_CHECKSUM