Merge branch 'master' of git://github.com/akvo/akvo-rsr

Conflicts:
	.gitignore

.gitignore

@@ -1,16 +1,16 @@
 .DS_Store
 .TemporaryItems
+.project
+.pydevproject
+*~
 *.kpf
 *.mo
 *.pyc
-akvo/settings.py
+akvo/data
 akvo/datadir
 akvo/mediaroot/admin
 akvo/mediaroot/db
-scripts/deployment/static_project_structure.py
-tests/acceptance/test_settings.py
-akvo/data
 akvo/mollie_banklist.xml
-.project
-.pydevproject
-.settings
+akvo/settings.py
+scripts/deployment/static_project_structure.py
+tests/akvo/acceptance/test_settings.py

RELEASE_NOTES.txt

@@ -1,15 +1,43 @@
-RELEASE_NOTES.txt, v0.9.18
-last changed: 6 Aug 2010, gvh
+RELEASE_NOTES.txt, v0.9.19
+last changed: 4 Oct 2010, bethw
 
 Akvo RSR (Really Simple Reporting) is part of the Akvo Platform. The Akvo Platform is used on Akvo.org to combat poverty through small-scale water and sanitation projects. We believe that Akvo RSR can be used in many other development aid scenarios, in areas such as education, health care, agriculture, etc.
 
 Read more about the [Akvo Platform](http://www.akvo.org/web/akvo_platform_overview).
 
+
+Akvo RSR v 0.9.19 release notes
+-------------------------------------------
+4 Oct 2010, (Code name: Magic) bethw
+
+This release adds a new project status to Akvo RSR, fixes a bug in the donations process and includes a point release update of the Django framework. 
+
+New features
+------------
+
+### Project Status
+A new project status has been added, Archived. Projects set to Archived will no longer appear in Akvo at a Glance figures, project lists or organisation pages. Donations boxes still appear on widgets; this is Lighthouse ticket #74.
+
+### Django 1.2.3
+Akvo RSR now runs on Django version 1.2.3. The security fix in 1.2.2 caused some problems with which have been remedied in this release. Additionally, to run Akvo RSR, you will want get zzgvh patch here:
+
+http://github.com/zzgvh/django/tree/1.2.1_patched  
+
+which fixes Django ticket 10046. http://code.djangoproject.com/ticket/10046
+
+Bug fixes
+------------
+
+### Donation emails not being sent.
+A code regression prevented donations from proceeding to Complete status. As a result, confirmation emails and funding totals in the Akvo at a Glance portlets were not appropriately updated. This has now been fixed.
+
+---
+
 Akvo RSR v 0.9.18 release notes
 -------------------------------------------
 6 Aug 2010, (Code name: Supercharge) gvh
 
-This release introduces page couters in Akvo RSR. We are also updating the version of Django that Akvo RSR runs on to 1.2.
+This release introduces page counters in Akvo RSR. We are also updating the version of Django that Akvo RSR runs on to 1.2.
 
 New features
 ------------

scripts/deployment/dev-requirements.txt

@@ -0,0 +1,19 @@
+# Django
+Django==1.2.3
+
+# Django Apps
+django-paypal
+-e git+git://github.com/peeb/django-mollie-ideal.git#egg=mollie
+-e hg+http://bitbucket.org/ubernostrum/django-registration/#egg=django-registration
+django-rosetta
+sorl-thumbnail
+template_utils
+django-piston
+django-counter
+
+# Other Python Modules
+BeautifulSoup
+Cython
+FeedParser
+PIL
+lxml

scripts/deployment/pip-requirements.txt

@@ -1,5 +1,5 @@
 # Django
-Django==1.2.1
+Django==1.2.3
 
 # Django Apps
 django-paypal
@@ -13,6 +13,7 @@ django-counter
 
 # Other Python Modules
 BeautifulSoup
+Cython
 FeedParser
 python-memcached
 PIL

scripts/integration/ci_environment.py

@@ -7,7 +7,7 @@
 import os, shutil
 
 def configure_acceptance_test_settings_for_ci():
-    acceptance_test_root_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '../../tests/acceptance'))
+    acceptance_test_root_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '../../tests/akvo/acceptance'))
 
     shutil.copy(os.path.join(acceptance_test_root_path, 'test_settings_ci.py'),
                 os.path.join(acceptance_test_root_path, 'test_settings.py'))

scripts/testing/run_acceptance_tests

@@ -42,7 +42,7 @@ verify_script_parameters $*
 
 SCRIPT_FILE_DIR="`dirname $0`"
 TESTING_SCRIPTS_DIR="`cd $SCRIPT_FILE_DIR; pwd`"
-ACCEPTANCE_TEST_ROOT_DIR="`cd $TESTING_SCRIPTS_DIR/../../tests/acceptance; pwd`"
+ACCEPTANCE_TEST_ROOT_DIR="`cd $TESTING_SCRIPTS_DIR/../../tests/akvo/acceptance; pwd`"
 
 RC_SERVER_LOG_PATH="$1"
 XVFB_LOG_PATH=""

tests/acceptance/api/xml/all_le_sponsored_projects_test.py → tests/akvo/acceptance/api/xml/all_le_sponsored_projects_test.py

@@ -37,7 +37,7 @@ def test_02_first_project_element_has_expected_xml_structure(self):
 
         project_country_element = first_project_element.find("country")
 
-        self.assert_element(project_country_element).has_exactly(len(COUNTRY_CHILDREN)).children()
+        self.assert_element(project_country_element).has_at_least(len(COUNTRY_CHILDREN)).children()
         self.assert_element(project_country_element).has_single_children_in_list(COUNTRY_CHILDREN)
 
 

tests/acceptance/api/xml/all_projects_test.py → tests/akvo/acceptance/api/xml/all_projects_test.py

@@ -37,7 +37,7 @@ def test_02_first_project_element_has_expected_xml_structure(self):
 
         project_country_element = first_project_element.find("country")
 
-        self.assert_element(project_country_element).has_exactly(len(COUNTRY_CHILDREN)).children()
+        self.assert_element(project_country_element).has_at_least(len(COUNTRY_CHILDREN)).children()
         self.assert_element(project_country_element).has_single_children_in_list(COUNTRY_CHILDREN)
 
 

tests/acceptance/api/xml/single_project_test.py → tests/akvo/acceptance/api/xml/single_project_test.py

@@ -34,7 +34,7 @@ def test_02_project_element_has_expected_xml_structure(self):
 
         project_country_element = project_element.find("country")
 
-        self.assert_element(project_country_element).has_exactly(len(COUNTRY_CHILDREN)).children()
+        self.assert_element(project_country_element).has_at_least(len(COUNTRY_CHILDREN)).children()
         self.assert_element(project_country_element).has_single_children_in_list(COUNTRY_CHILDREN)