Changeset 11271

Timestamp:

22 Feb 2014, 19:22:03 (11 years ago)

Author:

uli

Message:

Merge changes from 0 branch back into trunk.

Location:

main/kofacustom.skeleton/trunk

Files:

• . (modified) (1 prop)
• CHANGES.txt (modified) (1 diff)
• buildout.cfg (modified) (1 diff)
• setup.py (modified) (2 diffs)
• src/kofacustom/skeleton/interswitch/tests.py (modified) (2 diffs)

main/kofacustom.skeleton/trunk/CHANGES.txt

@@ -2 +2 @@
 *******
 
-0.2 (unreleased)
+0.2dev (unreleseased)
+=====================
+
+* No changes yet
+
+
+0.1 (2014-02-21)
 ================
 
-Feature changes
----------------
-
-* Started switch to groktoolkit (grok 1.1) based
-  application. `waeup.kofa` is not compatible with grok 1.0 anymore.
-
-* Added first rudimentary support for application plugins. Plugins are
-  looked up by the main app on creation time and created afterwards.
-
-* Added first rudimentary support for RSS2.0 feeds.
-
-* Generated filenames now have a filename extension that indicates
-  mode of processing. So fred.csv becomes fred.create.pending.csv when
-  being batch processed and something fails.
-
-* Coverage reports are now generated in ``coverage-report`` subdir of
-  build-directory.
-
-Bug fixes
----------
-
-* Removed all references to stuff in university submodule into the
-  module itself or replaced it with proper code. This way the
-  university submodule could be factored out of the waeup.kofa
-  package. Fixed bug #23.
-
-* Fixed default obj updater in batchprocessing. Fixed bug #17.
-
-* Fixed handling of pending file names, fixed bug #16.
-
-* Removed quick importer and all related components.
-
-* Removed TestData folder. It was too heavy and test data can be
-  created on-the-fly.
-
-
-0.1 (2010-01-31)
-================
-
-Initial version. (Incomplete) rewrite from the former CPS-based
-application.
+Initial version.

main/kofacustom.skeleton/trunk/buildout.cfg

@@ -41 +41 @@
 
 [sources]
-waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
-kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/0.2
+kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/branches/0.x
 
 [kofa_params]

main/kofacustom.skeleton/trunk/setup.py

@@ -2 +2 @@
 from setuptools import setup, find_packages
 
-version = '0.1dev'
+version = '0.2dev'
 
 install_requires = [
@@ -9 +9 @@
     'grokui.admin',
     'grokcore.startup',
-    'waeup.kofa',
-    'kofacustom.nigeria',
+    'waeup.kofa < 1.0',
+    'kofacustom.nigeria < 1.0',
     ],
 

main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interswitch/tests.py

@@ -17 +17 @@
 ##
 import os
+from datetime import datetime, date, timedelta
 from zope.component import createObject, getUtility
 from zope.catalog.interfaces import ICatalog
@@ -172 +173 @@
     def setUp(self):
         super(InterswitchTestsApplicants, self).setUp()
+        configuration = SessionConfiguration()
+        configuration.academic_session = datetime.now().year - 2
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.configuration = configuration
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.manage_path)