From 7fffd547ac72989d431284a4720eb91233c6162a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Wed, 3 Jul 2013 11:12:30 +0200 Subject: [PATCH] portal: updated models + added requirements --- portal/models.py | 4 +++- requirements.txt | 2 ++ requirements/common.txt | 4 ++++ requirements/dev.txt | 3 +++ requirements/prod.txt | 2 ++ requirements/test.txt | 6 ++++++ 6 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 requirements.txt create mode 100644 requirements/common.txt create mode 100644 requirements/dev.txt create mode 100644 requirements/prod.txt create mode 100644 requirements/test.txt diff --git a/portal/models.py b/portal/models.py index 79cb25d3..3c950a6f 100644 --- a/portal/models.py +++ b/portal/models.py @@ -21,6 +21,8 @@ # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from django.db import models +from .validators import validate_email + # Create your models here. @@ -33,7 +35,7 @@ class PendingUser(models.Model): # simplify form creation in forms.py first_name = models.TextField() last_name = models.TextField() - email = models.TextField() + email = models.EmailField(validators=[validate_email]) password = models.TextField() keypair = models.TextField() # institution diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..a75e4e36 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# Install all of our production dependencies only. +-r requirements/prod.txt diff --git a/requirements/common.txt b/requirements/common.txt new file mode 100644 index 00000000..4504f2fc --- /dev/null +++ b/requirements/common.txt @@ -0,0 +1,4 @@ +# requirements/common.txt +Django==1.4 +django-registration==1.0 +Sphinx==1.1.3 diff --git a/requirements/dev.txt b/requirements/dev.txt new file mode 100644 index 00000000..e82ac89e --- /dev/null +++ b/requirements/dev.txt @@ -0,0 +1,3 @@ +# requirements/dev.txt +-r common.txt +django-debug-toolbar==0.9.4 diff --git a/requirements/prod.txt b/requirements/prod.txt new file mode 100644 index 00000000..b658f947 --- /dev/null +++ b/requirements/prod.txt @@ -0,0 +1,2 @@ +# requirements/prod.txt +-r common.txt diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 00000000..83e4e8a7 --- /dev/null +++ b/requirements/test.txt @@ -0,0 +1,6 @@ +# requirements/test.txt +-r common.txt +django-coverage==1.2.2 +django-nose==0.1.3 +mock==0.8.0 +nosexcover==1.0.7 -- 2.43.0