From 7e2b5ddf8bf7ac377f9d9ed432bfd02ad7256c8d Mon Sep 17 00:00:00 2001 From: Lenka Segura Date: Oct 23 2018 22:18:55 +0000 Subject: Fix the PYTHONPATH for the dev_worker_1 container When trying to create new project using API, with the `create_readme=True` parameter, there was an ImportError: No module named `pagure.lib`, in the pre-receive hook of the new project. In dev_worker_1 container the PYTHONPATH was pointing to `.`. The hooks were probably not being run from the workdir set in the Dockerfile. Now it points to `/code` and the error is gone. --- diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index b68b52c..b04893e 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -33,7 +33,7 @@ services: - ../lcl/attachments:/attachments:ro - ..:/code:z environment: - - PYTHONPATH=. + - PYTHONPATH=/code - PAGURE_CONFIG=/code/dev/openshift.cfg logcom: build: diff --git a/pagure/forms.py b/pagure/forms.py index 0474d84..8aff2a7 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -141,7 +141,11 @@ class ProjectFormSimplified(PagureForm): ], ) avatar_email = wtforms.StringField( - "Avatar email", [wtforms.validators.optional()] + "Avatar email", + [ + wtforms.validators.Email(message='Hello hello not an email!'), + wtforms.validators.optional() + ], ) tags = wtforms.StringField( "Project tags", @@ -150,7 +154,9 @@ class ProjectFormSimplified(PagureForm): private = wtforms.BooleanField( "Private", [wtforms.validators.Optional()], false_values=FALSE_VALUES ) - + # def validate_avatar_email(form, avatar_email): + # if not re.match(r"[^@]+@[^@]+\.[^@]+", avatar_email): + # raise ValidationError('Email should look like email') class ProjectForm(ProjectFormSimplified): """ Form to create or edit project. """