Merge pull request #644 from NLeSC/534-code-of-conduct-email

NLeSC · Aug 29, 2024 · 632f80c · 632f80c
2 parents 79a3101 + f00781c
commit 632f80c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/copier/questions/features_community.yml b/copier/questions/features_community.yml
@@ -21,6 +21,16 @@ SelectCommunityFeatures:
       value: AddContributing_flag
       # validator: "{% if something != 'AnotherThing' %}BlaBla{% endif %}"
 
+code_of_conduct_email:
+  when: "{{ 'AddCodeConduct_flag' in SelectCommunityFeatures }}"
+  type: str
+  default: "{{ email }}"
+  help: What is the email address to report code of conduct violations?
+  validator: >-
+        {% if not (code_of_conduct_email | regex_search('([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+')) %}
+        Please enter a valid email address
+        {% endif %}
+
 # computed features
 AddCodeConduct:
   type: bool

diff --git a/copier/questions/package_details.yml b/copier/questions/package_details.yml
@@ -35,14 +35,6 @@ email:
         {% if not (email | regex_search('([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+')) %}
         Please enter a valid email address
         {% endif %}
-code_of_conduct_email:
-  type: str
-  default: "{{ email }}"
-  help: What is the email address to report code of conduct violations?
-  validator: >-
-        {% if not (code_of_conduct_email | regex_search('([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+')) %}
-        Please enter a valid email address
-        {% endif %}
 copyright_holder:
   type: str
   default: "{{ full_name }}"