From 5dc7dae7c1093d03eec59d92b3bfefebc60d41d6 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:15:37 +0200
Subject: [PATCH] Use pydantic[email] instead of email-validator

Co-authored-by: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
---
 lib/galaxy/dependencies/pinned-requirements.txt | 1 +
 packages/data/setup.cfg                         | 3 +--
 pyproject.toml                                  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index bb4031caacf..a40841a02d1 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -51,6 +51,7 @@ decorator==5.1.1 ; python_version >= "3.7" and python_version < "3.11"
 defusedxml==0.7.1 ; python_version >= "3.7" and python_version < "3.11"
 deprecation==2.1.0 ; python_version >= "3.7" and python_version < "3.11"
 dictobj==0.4 ; python_version >= "3.7" and python_version < "3.11"
+dnspython==2.2.1 ; python_version >= "3.7" and python_version < "3.11"
 docopt==0.6.2 ; python_version >= "3.7" and python_version < "3.11"
 docutils==0.16 ; python_version >= "3.7" and python_version < "3.11"
 ecdsa==0.18.0 ; python_version >= "3.7" and python_version < "3.11"
diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg
index f91c3c9f4e1..989cba73392 100644
--- a/packages/data/setup.cfg
+++ b/packages/data/setup.cfg
@@ -38,7 +38,6 @@ install_requires =
     bdbag
     bx-python
     contextvars; python_version >= "3.6" and python_version < "3.7"
-    email-validator
     galaxy-sequence-utils
     h5py
     isa-rwval
@@ -46,7 +45,7 @@ install_requires =
     numpy
     parsley
     pycryptodome
-    pydantic
+    pydantic[email]
     pylibmagic
     python-magic
     pysam
diff --git a/pyproject.toml b/pyproject.toml
index b8962f24164..fae53ce27dd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,6 @@ cwltool = "==3.1.20211107152837"
 dictobj = "*"
 docutils = "!=0.17, !=0.17.1"
 edam-ontology = "*"
-email-validator = "*"
 fastapi = ">=0.71.0"  # https://github.com/tiangolo/fastapi/issues/4041
 fastapi-utils = "*"
 fs = "*"
@@ -78,7 +77,7 @@ pebble = "*"
 psutil = "*"
 pulsar-galaxy-lib = ">=0.14.13"
 pycryptodome = "*"
-pydantic = "*"
+pydantic = {version = "*", extras = ["email"]}
 PyJWT = "*"
 pykwalify = "*"
 pylibmagic = "*"