[Blends-commit] [SCM] website branch, master, updated. cc029707a2bfe0a69c89fb770d3ef90e250704f9

Ole Streicher olebole at debian.org
Tue Jan 12 11:22:35 UTC 2016


The following commit has been merged in the master branch:
commit c6b776c934c5befb2de17d3233959da9272f1954
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Jan 12 08:48:50 2016 +0100

    Move hedaline and pdolinkname of tasks sections to blendstasktools

diff --git a/webtools_py3/blendstasktools_udd.py b/webtools_py3/blendstasktools_udd.py
index e942688..be94d7f 100644
--- a/webtools_py3/blendstasktools_udd.py
+++ b/webtools_py3/blendstasktools_udd.py
@@ -77,6 +77,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends'),
                                  'fields-set'   : (),
                                  'colorcode'    : 'Green: The project is <a href="#%s">available as an official Debian package and has high relevance</a>',
+                                 'headline'     : 'Official Debian packages with high relevance',
+                                 'pdolinkname'  : 'Official Debian package',
                                  'order'        : 1
                                },
              'official_low'  : # official package with low priority dependency
@@ -85,6 +87,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Suggests', ),
                                  'fields-set'   : (),
                                  'colorcode'    : 'Green: The project is <a href="#%s">available as an official Debian package but has lower relevance</a>',
+                                 'headline'     : 'Official Debian packages with lower relevance',
+                                 'pdolinkname'  : 'Official Debian package',
                                  'order'        : 2
                                },
              'non-free'      : # package in contrib or non-free, priority decreased to Suggests in any case
@@ -93,6 +97,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : (),
                                  'colorcode'    : 'Green: The project is <a href="#%s">available in Debian packaging pool but is not in Debian main</a>',
+                                 'headline'     : 'Debian packages in contrib or non-free',
+                                 'pdolinkname'  : 'Debian package in contrib/non-free',
                                  'order'        : 3
                                },
              'experimental'  : # package which exists only in experimental
@@ -101,6 +107,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : (),
                                  'colorcode'    : 'Yellow: The project is <a href="#%s">available in Debian packaging pool but is regarded as experimental</a>',
+                                 'headline'     : 'Debian packages in experimental',
+                                 'pdolinkname'  : 'Debian package in experimental',
                                  'order'        : 4
                                },
              'new'           : # package in new queue
@@ -109,6 +117,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : (),
                                  'colorcode'    : 'Yellow: A package of project is <a href="#%s">is in Debian New queue and hopefully available soon</a>',
+                                 'headline'     : 'Debian packages in New queue (hopefully available soon)',
+                                 'pdolinkname'  : 'New Debian package',
                                  'order'        : 5
                                },
              'pkgvcs'        : # Not yet packaged but packaging code in Vcs
@@ -117,6 +127,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : ('vcs-svn', 'vcs-git', 'vcs-browser'),
                                  'colorcode'    : 'Yellow: The packaging of project is <a href="#%s">has started and a developer might try the packaging code in VCS or help packaging.</a>',
+                                 'headline'     : 'Packaging has started and developers might try the packaging code in VCS',
+                                 'pdolinkname'  : 'New Debian package',
                                  'order'        : 6
                                },
              'unofficial'    : # unofficial packages outside Debian
@@ -125,6 +137,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : ('pkg-url', ),
                                  'colorcode'    : 'Yellow: There exists an <a href="#%s">unofficial package</a> of the project',
+                                 'headline'     : 'Unofficial packages built by somebody else',
+                                 'pdolinkname'  : 'Unofficial Debian package',
                                  'order'        : 7
                                },
              'wnpp'          : # project which has at least a WNPP bug filed
@@ -133,6 +147,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : ('wnpp', ),
                                  'colorcode'    : 'Red: The project is <a href="#%s">not (yet) available as a Debian package</a> but there is some record of interest (WNPP bug).',
+                                 'headline'     : 'No known packages available but some record of interest (WNPP bug)',
+                                 'pdolinkname'  : 'Debian package not available',
                                  'order'        : 8
                                },
              'prospective'   : # projects which might be interesting for a Blend but no work is done yet
@@ -141,6 +157,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : ('homepage', ),  # TODO: a description should be set as well ...
                                  'colorcode'    : 'Red: The project is <a href="#%s">not (yet) available as a Debian package</a>.',
+                                 'headline'     : 'Should not show up here',
+                                 'pdolinkname'  : '',
                                  'order'        : 9
                                },
              'ignore'        : # Package inside Debian which is "under observation"
@@ -149,6 +167,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Ignore', ),
                                  'fields-set'   : (),
                                  'colorcode'    : '%s',
+                                 'headline'     : 'Should not show up here',
+                                 'pdolinkname'  : '',
                                  'order'        : 10
                                },
              'avoid'         : # Package inside Debian which should not go to a install medium of the Blend
@@ -157,6 +177,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Avoid', ),
                                  'fields-set'   : (),
                                  'colorcode'    : '%s',
+                                 'headline'     : 'Should not show up here',
+                                 'pdolinkname'  : '',
                                  'order'        : 11
                                },
              'unknown'       : # Everything else
@@ -165,6 +187,8 @@ pkgstatus = {'official_high' : # official package with high priority dependency
                                  'dependencies' : ('Depends', 'Recommends', 'Suggests'),
                                  'fields-set'   : (),
                                  'colorcode'    : 'White: The project has an %s status.',
+                                 'headline'     : 'Should not show up here',
+                                 'pdolinkname'  : '',
                                  'order'        : 100
                                },
              }
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 0cf2553..b64a7dd 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -102,31 +102,6 @@ for lang in languages:
 
     # before fiddling around with unicode() read
     # http://www.red-mercury.com/blog/eclectic-tech/python-unicode-fixing-utf-8-encoded-as-latin-1-iso-8859-1/
-    pkgstatus['official_high']['headline']    = 'Official Debian packages with high relevance'
-    pkgstatus['official_high']['pdolinkname'] = 'Official Debian package'
-    pkgstatus['official_low'] ['headline']    = 'Official Debian packages with lower relevance'
-    pkgstatus['official_low'] ['pdolinkname'] = 'Official Debian package'
-    pkgstatus['non-free']     ['headline']    = 'Debian packages in contrib or non-free'
-    pkgstatus['non-free']     ['pdolinkname'] = 'Debian package in contrib/non-free'
-    pkgstatus['experimental'] ['headline']    = 'Debian packages in experimental'
-    pkgstatus['experimental'] ['pdolinkname'] = 'Debian package in experimental'
-    pkgstatus['new']          ['headline']    = 'Debian packages in New queue (hopefully available soon)'
-    pkgstatus['new']          ['pdolinkname'] = 'New Debian package'
-    pkgstatus['pkgvcs']       ['headline']    = 'Packaging has started and developers might try the packaging code in VCS'
-    pkgstatus['pkgvcs']       ['pdolinkname'] = 'Unofficial Debian package'
-    pkgstatus['unofficial']   ['headline']    = 'Unofficial packages built by somebody else'
-    pkgstatus['unofficial']   ['pdolinkname'] = 'Unofficial Debian package'
-    pkgstatus['prospective']  ['headline']    = 'No known packages available'
-    pkgstatus['prospective']  ['pdolinkname'] = 'Debian package not available'
-    pkgstatus['wnpp']         ['headline']    = 'No known packages available but some record of interest (WNPP bug)'
-    pkgstatus['wnpp']         ['pdolinkname'] = 'Debian package not available'
-    # Ignore/Avoid is only relevant for blends-dev, not webtools
-    pkgstatus['ignore']       ['headline']    = 'Should not show up here'
-    pkgstatus['prospective']  ['pdolinkname'] = ''
-    pkgstatus['avoid']        ['headline']    = 'Should not show up here'
-    pkgstatus['prospective']  ['pdolinkname'] = ''
-    pkgstatus['unknown']      ['headline']    = 'Should not show up here' # There must be a bug somewhere
-    pkgstatus['prospective']  ['pdolinkname'] = ''
     
     # Create the index page
     # Make sure that strings that need to be rendered as they are because they might

-- 
Static and dynamic websites for Debian Pure Blends



More information about the Blends-commit mailing list