Changeset 11398


Ignore:
Timestamp:
24 Feb 2014, 08:47:15 (11 years ago)
Author:
Henrik Bettermann
Message:

One never knows if FUTMinna comes back:

Diazofied whole package.
Removed sphinx docs.
Added generic install instructions.

Location:
main/waeup.futminna/trunk
Files:
16 added
9 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.futminna/trunk

    • Property svn:ignore

      •  

        old new  
        55develop-eggs
        66parts
         7sources
        78var

  • main/waeup.futminna/trunk/CHANGES.txt

    r7825 r11398  
    22*******
    33
    4 0.2 (unreleased)
     41.0.1dev (unreleased)
     5=====================
     6
     7* No changes yet.
     8
     91.0 (2014-02-24)
    510================
    611
    7 Feature changes
    8 ---------------
     12* Diazofied whole package.
    913
    10 * Started switch to groktoolkit (grok 1.1) based
    11   application. `waeup.kofa` is not compatible with grok 1.0 anymore.
     14* Removed sphinx docs.
    1215
    13 * Added first rudimentary support for application plugins. Plugins are
    14   looked up by the main app on creation time and created afterwards.
    15 
    16 * Added first rudimentary support for RSS2.0 feeds.
    17 
    18 * Generated filenames now have a filename extension that indicates
    19   mode of processing. So fred.csv becomes fred.create.pending.csv when
    20   being batch processed and something fails.
    21 
    22 * Coverage reports are now generated in ``coverage-report`` subdir of
    23   build-directory.
    24 
    25 Bug fixes
    26 ---------
    27 
    28 * Removed all references to stuff in university submodule into the
    29   module itself or replaced it with proper code. This way the
    30   university submodule could be factored out of the waeup.kofa
    31   package. Fixed bug #23.
    32 
    33 * Fixed default obj updater in batchprocessing. Fixed bug #17.
    34 
    35 * Fixed handling of pending file names, fixed bug #16.
    36 
    37 * Removed quick importer and all related components.
    38 
    39 * Removed TestData folder. It was too heavy and test data can be
    40   created on-the-fly.
     16* Added generic install instructions.
    4117
    4218
    … …  
    4420================
    4521
    46 Initial version. (Incomplete) rewrite from the former CPS-based
    47 application.
     22Initial version.

  • main/waeup.futminna/trunk/README.txt

    r7825 r11398  
    1 What is `waeup.kofa`?
    2 *********************
     1waeup.futminna
     2**************
    33
    4 The WAeUP Student Information and Registration Portal. `waeup.kofa` is
    5 a web-based management tool for managing universities and schools.
     4`waeup.futminna` is a Python package providing a student information
     5portal based on WAeUP Kofa.
    66
    7 The package was created as an effort of the WAeUP group. See
    8 http://www.waeup.org to learn more about WAeUP.
     7This is a customized version of Kofa for FUTMinna purposes.
    98
    10 Installation instructions can be found in the User Documentation (docs folder in the file system).
     9For generic install instructions please see INSTALL.txt.

  • main/waeup.futminna/trunk/buildout-zeo.cfg

    r9885 r11398  
    1313    site_zcml
    1414    zdaemon_conf
    15     deploy_ini
    16     debug_ini
     15    raw_deploy_ini
     16    raw_debug_ini
     17    themed_deploy_ini
     18    themed_debug_ini
    1719    profile_ini
    1820    zeo1_ini
    1921    zeo2_ini
    20     waeupdocs
    2122    coverage-detect
    2223    coverage-report
    2324# kofactl creation must be _after_ app!
    2425    kofactl
     26    lxml
     27    diazo
    2528# For backward compatibility, telling buildout not to throw away
    2629# the data and log subdirectories from the parts directory.
    … …  
    4447    address ${kofa_params:server_port}
    4548  </zeo>
    46 
    4749  <blobstorage 1>
    4850    blob-dir ${zope_conf:blobstorage}
    … …  
    5153    </filestorage>
    5254  </blobstorage>
    53 
    5455  <filestorage async>
    5556    path ${zope_conf:filestorage}/Data.async.fs
    5657  </filestorage>
    57 
    5858  <eventlog>
    5959    # This sets up logging to a file.
    … …  
    9696[zeo1_ini]
    9797recipe = collective.recipe.template
    98 input = etc/zeo1.ini.in
    99 output = ${buildout:parts-directory}/etc/zeo1.ini
     98input = etc/themed/zeo1.ini.in
     99output = ${buildout:parts-directory}/etc/themed-zeo1.ini
    100100
    101101[zeo2_ini]
    102102recipe = collective.recipe.template
    103 input = etc/zeo2.ini.in
    104 output = ${buildout:parts-directory}/etc/zeo2.ini
     103input = etc/themed/zeo2.ini.in
     104output = ${buildout:parts-directory}/etc/themed-zeo2.ini
    105105
    106106[zeo1_conf]
    … …  
    118118# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    119119recipe = zc.recipe.egg
    120 eggs = waeup.futminna [beaker]
     120eggs = waeup.futminna [beaker, diazo]
    121121arguments = "${buildout:parts-directory}/etc/zeo1.conf"
    122122scripts = kofactl=zeo_client1
    … …  
    125125# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    126126recipe = zc.recipe.egg
    127 eggs = waeup.futminna [beaker]
     127eggs = waeup.futminna [beaker, diazo]
    128128arguments = "${buildout:parts-directory}/etc/zeo2.conf"
    129129scripts = kofactl=zeo_client2

  • main/waeup.futminna/trunk/buildout.cfg

    r10141 r11398  
    1818    site_zcml
    1919    zdaemon_conf
    20     deploy_ini
    21     debug_ini
     20    raw_deploy_ini
     21    raw_debug_ini
     22    themed_deploy_ini
     23    themed_debug_ini
    2224    profile_ini
    23     waeupdocs
    2425    coverage-detect
    2526    coverage-report
    2627# kofactl creation must be _after_ app!
    2728    kofactl
     29    lxml
     30    diazo
    2831# For backward compatibility, telling buildout not to throw away
    2932# the data and log subdirectories from the parts directory.
    … …  
    6265# number of preopened paster threads, default 10
    6366threadpool_workers = 10
     67devel_pkg = waeup.futminna
    6468
    6569[app]
    6670# This creates all scripts in bin/. The kofactl created here is 'faulty'.
    6771recipe = zc.recipe.egg
    68 eggs = waeup.futminna [beaker]
     72eggs = waeup.futminna [beaker, diazo]
    6973       z3c.evalexception>=2.0
    7074       Paste
    … …  
    8084# fixed path to zdaemon.conf as argument.
    8185recipe = zc.recipe.egg
    82 eggs = waeup.futminna [beaker]
     86eggs = waeup.futminna [beaker, diazo]
    8387arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
    8488scripts = kofactl=kofactl
    … …  
    146150output = ${buildout:parts-directory}/etc/zdaemon.conf
    147151
    148 [deploy_ini]
    149 recipe = collective.recipe.template
    150 input = etc/deploy.ini.in
    151 output = ${buildout:parts-directory}/etc/deploy.ini
    152 
    153 [debug_ini]
    154 recipe = collective.recipe.template
    155 input = etc/debug.ini.in
    156 output = ${buildout:parts-directory}/etc/debug.ini
     152[raw_debug_ini]
     153recipe = collective.recipe.template
     154input = etc/raw/debug.ini.in
     155output = ${buildout:parts-directory}/etc/raw-debug.ini
     156
     157[raw_deploy_ini]
     158recipe = collective.recipe.template
     159input = etc/raw/deploy.ini.in
     160output = ${buildout:parts-directory}/etc/raw-deploy.ini
     161
     162[themed_debug_ini]
     163recipe = collective.recipe.template
     164input = etc/themed/debug.ini.in
     165output = ${buildout:parts-directory}/etc/themed-debug.ini
     166
     167[themed_deploy_ini]
     168recipe = collective.recipe.template
     169input = etc/themed/deploy.ini.in
     170output = ${buildout:parts-directory}/etc/themed-deploy.ini
    157171
    158172[profile_ini]
    … …  
    165179eggs = grok
    166180url = http://grok.zope.org/releaseinfo/grok-eggs-1.1.tgz
    167 
    168 [waeupdocs]
    169 recipe = collective.recipe.sphinxbuilder
    170 eggs = waeup.futminna[docs]
    171 source = ${buildout:directory}/docs/source
    172 build = ${buildout:directory}/docs/build
    173181
    174182# Collect test coverage data.
    … …  
    186194scripts = coveragereport
    187195arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
     196
     197[lxml]
     198recipe = z3c.recipe.staticlxml
     199egg = lxml
     200
     201[diazo]
     202recipe = zc.recipe.egg
     203eggs =
     204    diazo [wsgi]
     205    PasteScript
     206    waeup.futminna [beaker, diazo]

  • main/waeup.futminna/trunk/etc/zdaemon.conf.in

    r8832 r11398  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
     2  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/themed-deploy.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon.log

  • main/waeup.futminna/trunk/etc/zeo1.conf.in

    r8507 r11398  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
     2  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
    33  daemon on
    4   transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
    5   socket-name ${zope_conf:logfiles}/zeo1.sock
     4  transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
     5  socket-name ${zope_conf:logfiles}/zeo2.sock
    66  # Enable this to run the child process as a different user
    7   user kofa
     7  # user kofa
    88</runner>

  • main/waeup.futminna/trunk/etc/zeo2.conf.in

    r8507 r11398  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
     2  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
    55  socket-name ${zope_conf:logfiles}/zeo2.sock
    66  # Enable this to run the child process as a different user
    7   user kofa
     7  # user kofa
    88</runner>

  • main/waeup.futminna/trunk/setup.py

    r9225 r11398  
    22from setuptools import setup, find_packages
    33
    4 version = '0.1dev'
     4version = '1.0dev'
    55
    66install_requires =[
    … …  
    99    'grokui.admin',
    1010    'grokcore.startup',
    11     'waeup.kofa',
    12     'kofacustom.nigeria',
     11    'waeup.kofa >= 1.0',
     12    'kofacustom.nigeria >= 1.0',
    1313    ],
    1414
    … …  
    2222    ]
    2323
     24diazo_require = [
     25    'diazo',
     26    'webob',
     27]
     28
    2429tests_require = [
    2530    'z3c.testsetup',
    … …  
    3035    ]
    3136
    32 docs_require = [
    33     'Sphinx',
    34     'collective.recipe.sphinxbuilder',
    35     'docutils',
    36     'roman',
    37     'repoze.sphinx.autointerface',
    38     ]
    39 
    4037def read(*rnames):
    4138    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
    … …  
    4340long_description = (
    4441    read('README.txt')
    45     + '\n\n'
    46     + read('src', 'waeup', 'futminna', 'README.txt')
    4742    + '\n\n'
    4843    + read('CHANGES.txt')
    … …  
    8479      extras_require = dict(
    8580        test = tests_require,
    86         docs = docs_require,
    8781        beaker = beaker_require,
     82        diazo = diazo_require,
    8883        ),
    8984      entry_points="""
    90       # Add entry points here
    91       [hurry.resource.libraries]
    92       waeup_custom = waeup.futminna.browser.resources:waeup_custom
    9385      [console_scripts]
    9486      kofa-debug = grokcore.startup:interactive_debug_prompt

  • main/waeup.futminna/trunk/src/waeup/futminna/browser/tests.py

    r8619 r11398  
    4949        shutil.rmtree(self.dc_root)
    5050
    51     def test_custom_theme(self):
    52         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    53         self.browser.open('http://localhost/app/configuration')
    54         self.assertMatches('...FUTMinna Theme...', self.browser.contents)
    55         self.browser.getControl(name="form.skin").value = ['custom theme']
    56         self.browser.getControl("Save").click()
    57         self.browser.open('http://localhost/app/configuration')
    58         return
    59 
    6051    def test_access_live_url(self):
    6152        # We can't access the system with basic authentication

  • main/waeup.futminna/trunk/src/waeup/futminna/interswitch/browser_templates/applicant_goto_interswitch.pt

    r10165 r11398  
    7272  <span tal:replace="structure view/xml_data"></span>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7575
    7676  <br /><br />
    7777
    78   <img tal:attributes="src view/interswitch_img_url" />
     78  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7979
    8080</form>

  • main/waeup.futminna/trunk/src/waeup/futminna/interswitch/browser_templates/student_goto_interswitch.pt

    r9995 r11398  
    7272  <span tal:replace="structure view/xml_data"></span>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
     75
     76  <br /><br />
     77
     78  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7579
    7680</form>

  • main/waeup.futminna/trunk/versions.cfg

    r10197 r11398  
    130130# dolmen.beaker==0.1
    131131pycryptopp = 0.6.0.1206569328141510525648634803928199668821045408958
     132
     133# Added by buildout at 2014-02-24 09:09:43.882599
     134WebOb = 1.3.1
     135diazo = 1.0.5
     136repoze.xmliter = 0.5
     137z3c.recipe.staticlxml = 0.10
     138
     139# Required by:
     140# diazo==1.0.5
     141experimental.cssselect = 0.3
     142
     143# Required by:
     144# diazo==1.0.5
     145# experimental.cssselect==0.3
     146lxml = 3.3.1
     147
     148# Required by:
     149# z3c.recipe.staticlxml==0.10
     150zc.recipe.cmmi = 1.3.5
Note: See TracChangeset for help on using the changeset viewer.