Ignore:
Timestamp:
11 Apr 2016, 07:00:06 (9 years ago)
Author:
Henrik Bettermann
Message:

Pin waeup.kofa version 1.4.1 and adjust to changes made in base package.

Location:
main/kofacustom.sampleuni/trunk
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.sampleuni/trunk/CHANGES.txt

    r12482 r13827  
    55=====================
    66
    7 * Pin waeup.kofa 1.3.1
     7* Pin waeup.kofa 1.4.1
    88
    99* Adjust to layout changes made in base package.

  • main/kofacustom.sampleuni/trunk/bootstrap.py

    r11858 r13827  
    2626from optparse import OptionParser
    2727
    28 tmpeggs = tempfile.mkdtemp()
     28__version__ = '2015-07-01'
     29# See zc.buildout's changelog if this version is up to date.
     30
     31tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
    2932
    3033usage = '''\
    … …  
    3639Python that you want bin/buildout to use.
    3740
    38 Note that by using --find-links to point to local resources, you can keep 
     41Note that by using --find-links to point to local resources, you can keep
    3942this script from going over the network.
    4043'''
    4144
    4245parser = OptionParser(usage=usage)
    43 parser.add_option("-v", "--version", help="use a specific zc.buildout version")
    44 
     46parser.add_option("--version",
     47                  action="store_true", default=False,
     48                  help=("Return bootstrap.py version."))
    4549parser.add_option("-t", "--accept-buildout-test-releases",
    4650                  dest='accept_buildout_test_releases',
    … …  
    5761parser.add_option("-f", "--find-links",
    5862                  help=("Specify a URL to search for buildout releases"))
    59 
     63parser.add_option("--allow-site-packages",
     64                  action="store_true", default=False,
     65                  help=("Let bootstrap.py use existing site packages"))
     66parser.add_option("--buildout-version",
     67                  help="Use a specific zc.buildout version")
     68parser.add_option("--setuptools-version",
     69                  help="Use a specific setuptools version")
     70parser.add_option("--setuptools-to-dir",
     71                  help=("Allow for re-use of existing directory of "
     72                        "setuptools versions"))
    6073
    6174options, args = parser.parse_args()
     75if options.version:
     76    print("bootstrap.py version %s" % __version__)
     77    sys.exit(0)
     78
    6279
    6380######################################################################
    64 # load/install distribute
    65 
    66 to_reload = False
     81# load/install setuptools
     82
    6783try:
    68     import pkg_resources
    69     import setuptools
    70     if not hasattr(pkg_resources, '_distribute'):
    71         to_reload = True
    72         raise ImportError
     84    from urllib.request import urlopen
    7385except ImportError:
    74     ez = {}
    75 
    76     try:
    77         from urllib.request import urlopen
    78     except ImportError:
    79         from urllib2 import urlopen
    80 
    81     exec(urlopen(
    82         'http://downloads.buildout.org/2.1/distribute_setup.py').read(), ez)
    83     setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
    84     ez['use_setuptools'](**setup_args)
    85 
    86     if to_reload:
    87         reload(pkg_resources)
    88     import pkg_resources
    89     # This does not (always?) update the default working set.  We will
    90     # do it.
    91     for path in sys.path:
    92         if path not in pkg_resources.working_set.entries:
    93             pkg_resources.working_set.add_entry(path)
     86    from urllib2 import urlopen
     87
     88ez = {}
     89if os.path.exists('ez_setup.py'):
     90    exec(open('ez_setup.py').read(), ez)
     91else:
     92    exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
     93
     94if not options.allow_site_packages:
     95    # ez_setup imports site, which adds site packages
     96    # this will remove them from the path to ensure that incompatible versions
     97    # of setuptools are not in the path
     98    import site
     99    # inside a virtualenv, there is no 'getsitepackages'.
     100    # We can't remove these reliably
     101    if hasattr(site, 'getsitepackages'):
     102        for sitepackage_path in site.getsitepackages():
     103            # Strip all site-packages directories from sys.path that
     104            # are not sys.prefix; this is because on Windows
     105            # sys.prefix is a site-package directory.
     106            if sitepackage_path != sys.prefix:
     107                sys.path[:] = [x for x in sys.path
     108                               if sitepackage_path not in x]
     109
     110setup_args = dict(to_dir=tmpeggs, download_delay=0)
     111
     112if options.setuptools_version is not None:
     113    setup_args['version'] = options.setuptools_version
     114if options.setuptools_to_dir is not None:
     115    setup_args['to_dir'] = options.setuptools_to_dir
     116
     117ez['use_setuptools'](**setup_args)
     118import setuptools
     119import pkg_resources
     120
     121# This does not (always?) update the default working set.  We will
     122# do it.
     123for path in sys.path:
     124    if path not in pkg_resources.working_set.entries:
     125        pkg_resources.working_set.add_entry(path)
    94126
    95127######################################################################
    … …  
    98130ws = pkg_resources.working_set
    99131
     132setuptools_path = ws.find(
     133    pkg_resources.Requirement.parse('setuptools')).location
     134
     135# Fix sys.path here as easy_install.pth added before PYTHONPATH
    100136cmd = [sys.executable, '-c',
     137       'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
    101138       'from setuptools.command.easy_install import main; main()',
    102139       '-mZqNxd', tmpeggs]
    … …  
    111148    cmd.extend(['-f', find_links])
    112149
    113 distribute_path = ws.find(
    114     pkg_resources.Requirement.parse('distribute')).location
    115 
    116150requirement = 'zc.buildout'
    117 version = options.version
     151version = options.buildout_version
    118152if version is None and not options.accept_buildout_test_releases:
    119153    # Figure out the most recent final version of zc.buildout.
    … …  
    122156
    123157    def _final_version(parsed_version):
    124         for part in parsed_version:
    125             if (part[:1] == '*') and (part not in _final_parts):
    126                 return False
    127         return True
     158        try:
     159            return not parsed_version.is_prerelease
     160        except AttributeError:
     161            # Older setuptools
     162            for part in parsed_version:
     163                if (part[:1] == '*') and (part not in _final_parts):
     164                    return False
     165            return True
     166
    128167    index = setuptools.package_index.PackageIndex(
    129         search_path=[distribute_path])
     168        search_path=[setuptools_path])
    130169    if find_links:
    131170        index.add_find_links((find_links,))
    … …  
    150189
    151190import subprocess
    152 if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
     191if subprocess.call(cmd) != 0:
    153192    raise Exception(
    154         "Failed to execute command:\n%s",
    155         repr(cmd)[1:-1])
     193        "Failed to execute command:\n%s" % repr(cmd)[1:-1])
    156194
    157195######################################################################

  • main/kofacustom.sampleuni/trunk/layout/rules.xml

    r11472 r13827  
    4949             css:content-children="ul.kofa-navbar-right" />
    5050
     51    <!-- maintenance mode warning -->
     52    <drop css:theme="div.kofa-maintenance"
     53          css:if-not-content="div.maintenance-warning" />
     54    <replace css:theme-children="div.maintenance-warning"
     55             css:content-children="div.maintenance-warning" />
     56
    5157    <!-- breadcrumbs -->
    5258    <drop css:theme="div.kofa-breadcrumbs-box-long"
    … …  
    96102          css:if-not-content="table.kofa-data-table" />
    97103
     104<!--
    98105
     106    <rules css:if-not-content="input.datepicker-le-year">
     107        <drop css:theme="script.jquery-ui"
     108              css:if-not-content="[data-toggle='tooltip']" />
     109    </rules>
     110
     111-->
    99112<!--
    100113    <after css:theme-children="html head"

  • main/kofacustom.sampleuni/trunk/layout/static/css/base.css

    r12482 r13827  
    3232}
    3333
    34 .breadcrumb , .wfstatus {
     34.breadcrumb , .wfstatus, .maintenance-warning {
    3535    background-color: #fff;
    3636    margin-bottom: 0px;
    … …  
    6969.kofa-breadcrumbs-box-short,
    7070.kofa-breadcrumbs-box-long,
    71 .kofa-student-status-box {
     71.kofa-student-status-box,
     72.kofa-maintenance {
    7273    padding: 0px 5px 0px 5px;
    7374}
    … …  
    8586.kofa-breadcrumbs-box-short .well,
    8687.kofa-breadcrumbs-box-long .well,
    87 .kofa-student-status-box .well {
     88.kofa-student-status-box .well,
     89.kofa-maintenance .well {
    8890    padding: 5px 5px 5px 5px;
    8991}
    … …  
    106108.kofa-student-status-box .well {
    107109    background-color: #909090;
     110}
     111
     112.maintenance-warning {
     113    text-align: center;
     114}
     115
     116.kofa-maintenance .well {
     117    background-color: red;
    108118}
    109119
    … …  
    163173    margin: 0px 0px 4px 0px;
    164174    display: inline-block;
     175}
     176
     177/* Documentation link*/
     178
     179div.documentation {
     180    margin-top: -20px;
     181    text-align: right;
    165182}
    166183

  • main/kofacustom.sampleuni/trunk/layout/theme.html

    r11748 r13827  
    9191
    9292      <div class="row">
     93        <div class="col-md-12 container kofa-maintenance">
     94          <div class="well">
     95            <div class="maintenance-warning">
     96                M A I N T E N A N C E &nbsp;&nbsp;&nbsp; M O D E
     97            </div> <!-- /maintenance-warning -->
     98          </div> <!-- /well -->
     99        </div> <!-- /kofa-maintenance -->
     100      </div>
     101
     102      <div class="row">
    93103        <div class="col-md-12 container kofa-breadcrumbs-box-long">
    94104          <div class="well">
    … …  
    116126            </ol><!-- /kofa-breadcrumbs -->
    117127          </div> <!-- /well -->
    118         </div> <!-- /kofa-breadcrumbs-box-short -->
     128        </div> <!-- /kofa-breadcrumbs-box-long -->
    119129      </div>
    120130
    … …  
    335345            </div>
    336346            <div>...content that spans the whole page.</div>
     347
     348            <br><br>
     349            <h3>Accordions</h3>
     350            <div class="panel-group" id="accordion" role="tablist"
     351                 aria-multiselectable="true">
     352              <div class="panel panel-default">
     353                <div class="panel-heading" role="tab" id="headingTwo">
     354                  <h4 class="panel-title">
     355                    <a class="collapsed" data-toggle="collapse"
     356                       data-parent="#accordion" href="#collapseTwo"
     357                       aria-expanded="false" aria-controls="collapseTwo">
     358                      Collapsible Group
     359                    </a>
     360                  </h4>
     361                </div>
     362                <div id="collapseTwo" class="panel-collapse collapse"
     363                     role="tabpanel" aria-labelledby="headingTwo">
     364                  <div class="panel-body">
     365                    Anim pariatur cliche reprehenderit, enim eiusmod high life
     366                    terry richardson ad squid. 3 wolf moon officia aute, non
     367                    skateboard dolor brunch. Food truck quinoa laborum eiusmod.
     368                  </div>
     369                </div>
     370              </div>
     371            </div>
     372
    337373            <br><br>
    338374            <h3>A Sample Data Table</h3>
    … …  
    518554              </tbody>
    519555            </table>
     556            <br>
     557            <div class="documentation">
     558              <a href="#" target="_blank">
     559                Kofa Docs for this page
     560              </a>
     561            </div>
    520562          </div> <!-- /well kofa-content-->
    521563        </div> <!-- /kofa-content-wide -->

  • main/kofacustom.sampleuni/trunk/setup.py

    r13289 r13827  
    99    'grokui.admin',
    1010    'grokcore.startup',
    11     'waeup.kofa >= 1.3.3',
     11    'waeup.kofa >= 1.4.1',
    1212    ],
    1313

  • main/kofacustom.sampleuni/trunk/versions.cfg

    r13289 r13827  
    88
    99[versions]
    10 collective.recipe.sphinxbuilder = 0.7.0
     10alabaster = 0.7.7
     11Babel = 1.3
     12Beaker = 1.6.4
     13collective.recipe.sphinxbuilder = 0.8.2
     14collective.recipe.template = 1.10
     15coverage = 3.6
     16diazo = 1.0.6
     17distribute = 0.6.49
     18docutils = 0.11
     19dolmen.beaker = 0.1
     20experimental.cssselect = 0.3
     21grok = 1.1.1
     22grokcore.view = 1.13.5
     23grokui.admin = 0.6.4
     24grokui.base = 0.2.2
     25horae.sphinx.grok = 1.0a1
     26hurry.file = 1.2.1
     27hurry.jquery = 1.4.3.1
     28hurry.jqueryui = 1.8.5.1
     29hurry.query = 1.1.1
     30hurry.resource = 0.10
    1131hurry.workflow = 0.11
    12 # Pinned to circumvent breakage in 0.4.x
    1332hurry.zoperesource = 0.6
    14 # Pinned to prevent buildout svn-error.
     33Jinja2 = 2.3.1
    1534lovely.recipe = 1.0.0
     35lxml = 3.3.6
     36martian = 0.11.3
     37mechanize = 0.2.5
    1638megrok.layout = 1.0.2
     39megrok.menu = 0.4
     40mock = 1.0.1
     41mr.developer = 1.27
     42Paste = 1.7.5.1
     43PasteDeploy = 1.3.4
     44PasteScript = 1.7.5
     45Pillow = 2.0.0
     46plone.recipe.command = 1.1
     47psutil = 2.1.3
     48py = 1.0.2
     49pycryptopp = 0.6.0.1206569328141510525648634803928199668821045408958
     50Pygments = 2.0.2
     51pyprof2calltree = 1.1.1
    1752reportlab = 2.5
    18 transaction = 1.1.0
    19 z3c.testsetup = 0.6.1
    20 zc.buildout = 2.1.0
    21 zc.recipe.egg = 2.0.0a3
    22 zc.recipe.testrunner = 2.0.0
    23 zope.app.testing = 3.8.1
    24 # for support of @provider directive
    25 zope.interface = 3.6.3
    26 # for support of contextual default values
    27 zope.schema = 3.8.0
    28 zope.testing = 3.10.2
    29 zope.xmlpickle = 3.4.0
    30 # Require latest version...
    31 Sphinx = 1.0.7
    32 ZODB3 = 3.10.3
    33 docutils = 0.7
    34 Jinja2 = 2.3
    35 # for support of unicode encoded passwords
    36 zope.password = 3.6.1
    37 zope.publisher = 3.12.2
    38 # Pillow >= 2.0 supports Python 2.6, 2.7, 3.x
    39 # Pillow < 1.x supports Python 2.4, 2.5, 2.6, 2.7
    40 Pillow = 2.0.0
    41 mock = 1.0.1
    42 
    43 
    44 # Added by buildout at 2013-05-22 17:48:55.686088
    45 Beaker = 1.6.4
    46 Twisted = 13.0.0
    47 dolmen.beaker = 0.1
    48 hurry.resource = 0.10
    49 mr.developer = 1.25
    5053repoze.profile = 2.0
    5154repoze.sphinx.autointerface = 0.7.1
     55repoze.xmliter = 0.5
     56RestrictedPython = 3.5.2
     57rwproperty = 1.0
     58setuptools = 19.2
     59six = 1.10.0
     60snowballstemmer = 1.2.1
     61Sphinx = 1.3.5
     62sphinx-rtd-theme = 0.1.9
     63transaction = 1.1.1
     64Twisted = 13.0.0
     65ulif.loghandlers = 0.1.1
     66unicodecsv = 0.9.4
    5267unittest2 = 0.5.1
    53 z3c.coverage = 2.0.0
     68uuid = 1.30
     69WebOb = 1.3.1
     70z3c.autoinclude = 0.3.6
     71# z3c.coverage 2.0 is out but does not cope with non-ASCII in sources
     72z3c.coverage = 1.3.1
     73z3c.recipe.staticlxml = 0.10
     74z3c.testsetup = 0.6.1
    5475zc.async = 1.5.4
     76zc.buildout = 2.5.0
     77zc.catalog = 1.4.5
    5578zc.dict = 1.2.1
     79zc.lockfile = 1.0.2
     80zc.monitor = 0.3.1
     81zc.ngi = 2.0.1
     82zc.queue = 1.3
     83zc.recipe.cmmi = 1.3.6
     84zc.recipe.egg = 2.0.3
     85zc.recipe.testrunner = 2.0.0
     86zc.resourcelibrary = 1.3.4
    5687zc.twist = 1.3.1
    5788zc.z3monitor = 0.8.0
     89zc.zodbrecipes = 0.6.2
     90zdaemon = 2.0.7
     91ZODB3 = 3.10.5
     92zope.app.apidoc = 3.7.5
     93zope.app.applicationcontrol = 3.5.10
     94zope.app.basicskin = 3.5.1
     95zope.app.dav = 3.5.3
     96zope.app.error = 3.5.3
     97zope.app.exception = 3.6.3
     98zope.app.folder = 3.5.2
     99zope.app.form = 4.0.2
     100zope.app.i18n = 3.6.4
     101zope.app.interface = 3.5.2
     102zope.app.keyreference = 3.6.1
     103zope.app.locales = 3.6.2
     104zope.app.localpermission = 3.7.2
     105zope.app.principalannotation = 3.7.1
     106zope.app.publisher = 3.10.2
     107zope.app.rotterdam = 3.5.3
     108zope.app.session = 3.6.2
     109zope.app.testing = 3.9.0
     110zope.app.zcmlfiles = 3.7.1
     111zope.app.zopeappgenerations = 3.5.1
     112zope.authentication = 3.7.1
    58113zope.bforest = 1.2
     114zope.browsermenu = 3.9.1
     115zope.browserresource = 3.10.3
     116zope.cachedescriptors = 3.5.1
     117zope.catalog = 3.8.2
     118zope.component = 3.9.5
     119zope.componentvocabulary = 1.0.1
     120zope.configuration = 3.7.4
     121zope.container = 3.11.2
     122zope.contenttype = 3.5.5
     123zope.datetime = 3.4.1
     124zope.deferredimport = 3.5.3
     125zope.deprecation = 3.4.1
     126zope.documenttemplate = 3.4.3
     127zope.dublincore = 3.6.3
     128zope.error = 3.7.4
     129zope.errorview = 0.11
     130zope.filerepresentation = 3.6.1
     131zope.formlib = 4.0.6
     132zope.i18n = 3.7.4
     133zope.i18nmessageid = 3.5.3
     134zope.index = 3.6.4
     135zope.interface = 3.6.7
     136zope.keyreference = 3.6.4
     137zope.lifecycleevent = 3.6.2
     138zope.location = 3.9.1
     139zope.pagetemplate = 3.5.2
     140zope.password = 3.6.1
     141zope.pluggableauth = 1.0.3
     142zope.principalannotation = 3.6.1
     143zope.principalregistry = 3.7.1
     144zope.publisher = 3.12.6
     145zope.schema = 3.8.1
     146zope.security = 3.7.4
     147zope.sendmail = 3.7.5
     148zope.server = 3.6.3
     149zope.session = 3.9.5
     150zope.site = 3.9.2
     151zope.tales = 3.5.3
     152zope.testbrowser = 4.0.4
     153zope.testing = 3.10.3
     154zope.testrunner = 4.3.3
     155zope.traversing = 3.12.1
     156zope.viewlet=3.7.2
     157zope.xmlpickle = 3.4.0
    59158
    60 # Required by:
    61 # z3c.coverage==2.0.0
    62 coverage = 3.6
    63 
    64 # Required by:
    65 # waeup.kofa==0.2dev
    66 hurry.file = 1.2.1
    67 
    68 # Required by:
    69 # waeup.kofa==0.2dev
    70 hurry.jquery = 1.4.3.1
    71 
    72 # Required by:
    73 # waeup.kofa==0.2dev
    74 hurry.jqueryui = 1.8.5.1
    75 
    76 # Required by:
    77 # waeup.kofa==0.2dev
    78 hurry.query = 1.1.1
    79 
    80 # Required by:
    81 # grokui.base==0.2
    82 megrok.menu = 0.4
    83 
    84 # Required by:
    85 # dolmen.beaker==0.1
    86 pycryptopp = 0.6.0.1206569328141510525648634803928199668821045408958
    87 
    88 # Required by:
    89 # repoze.profile==2.0
    90 pyprof2calltree = 1.1.0
    91 
    92 # Required by:
    93 # zc.async==1.5.4
    94 rwproperty = 1.0
    95 
    96 # Required by:
    97 # zope.testrunner==4.3.3
    98 six = 1.3.0
    99 
    100 # Required by:
    101 # waeup.kofa==0.2dev
    102 ulif.loghandlers = 0.1.1
    103 
    104 # Required by:
    105 # waeup.kofa==0.2dev
    106 unicodecsv = 0.9.4
    107 
    108 # Required by:
    109 # zc.async==1.5.4
    110 uuid = 1.30
    111 
    112 # Required by:
    113 # zc.z3monitor==0.8.0
    114 zc.monitor = 0.3.1
    115 
    116 # Required by:
    117 # zc.monitor==0.3.1
    118 zc.ngi = 2.0.1
    119 
    120 # Required by:
    121 # zc.async==1.5.4
    122 zc.queue = 1.3
    123 
    124 # Required by:
    125 # waeup.kofa==0.2dev
    126 zope.errorview = 0.11
    127 
    128 # Required by:
    129 # zc.recipe.testrunner==2.0.0
    130 zope.testrunner = 4.3.3
    131 
    132 # Added by buildout at 2014-02-17 16:26:51.455299
    133 WebOb = 1.3.1
    134 diazo = 1.0.5
    135 repoze.xmliter = 0.5
    136 z3c.recipe.staticlxml = 0.10
    137 
    138 # Required by:
    139 # diazo==1.0.5
    140 experimental.cssselect = 0.3
    141 
    142 # Required by:
    143 # diazo==1.0.5
    144 # experimental.cssselect==0.3
    145 lxml = 3.3.1
    146 
    147 # Required by:
    148 # z3c.recipe.staticlxml==0.10
    149 zc.recipe.cmmi = 1.3.5
    150 
    151 # Added by buildout at 2014-02-21 08:11:47.544699
    152 zc.zodbrecipes = 2.0.0
    153 
    154 waeup.kofa = 1.3.3
    155 
    156 # Added by buildout at 2015-01-16 07:34:12.267717
    157 
    158 # Required by:
    159 # waeup.kofa==1.3.1
    160 psutil = 2.2.0
     159# Added by buildout at 2016-04-11 08:52:15.063438
     160waeup.kofa = 1.4.1
Note: See TracChangeset for help on using the changeset viewer.