Mercurial > public > sg101
changeset 787:7e17b9e45356
Merge.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sat, 17 May 2014 12:17:14 -0500 |
| parents | aa7c97d93a85 (current diff) 85880b0df024 (diff) |
| children | 84aa49497718 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/donations/tests.py Sat May 17 12:16:21 2014 -0500 +++ b/donations/tests.py Sat May 17 12:17:14 2014 -0500 @@ -116,9 +116,9 @@ def test_monthly_goal_pct(self): - self.assertEqual(settings.DONATIONS_GOAL, Decimal('100.00')) + self.assertEqual(settings.DONATIONS_GOAL, Decimal('120.00')) pct = Donation.objects.monthly_goal_pct(year=2012, month=9) - self.assertEqual(pct, 23) + self.assertEqual(pct, 19) def test_monthly_goal_pct2(self):
--- a/requirements_dev.txt Sat May 17 12:16:21 2014 -0500 +++ b/requirements_dev.txt Sat May 17 12:17:14 2014 -0500 @@ -1,4 +1,4 @@ -Django==1.6.2 +Django==1.6.5 Markdown==2.3.1 MySQL-python==1.2.5 django-debug-toolbar==1.0 @@ -28,7 +28,7 @@ pycrypto==2.5 ssh==1.7.13 ftfy==2.0.1 -Pillow==2.1.0 +Pillow==2.4.0 boto==2.13.0 sqlparse==0.1.10 billiard==3.3.0.13