From 4976b6fb79d1f4809f3a51b625c3a2bba9264294 Mon Sep 17 00:00:00 2001
From: Hugo Levy-Falk <klafyvel@gmail.com>
Date: Sun, 14 Feb 2021 09:26:29 +0100
Subject: [PATCH] fix: correct management of extra dependencies.

---
 poetry.lock    | 29 +++++++++++++++++------------
 pyproject.toml | 11 ++++++++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 7a1ec92b..d2100b7e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -152,7 +152,7 @@ name = "django-ldapdb"
 version = "1.5.1"
 description = "A LDAP database backend for Django"
 category = "main"
-optional = false
+optional = true
 python-versions = ">=3.6"
 
 [package.dependencies]
@@ -333,7 +333,7 @@ name = "mysqlclient"
 version = "2.0.3"
 description = "Python interface to MySQL"
 category = "main"
-optional = false
+optional = true
 python-versions = ">=3.5"
 
 [[package]]
@@ -379,7 +379,7 @@ name = "psycopg2"
 version = "2.8.6"
 description = "psycopg2 - Python-PostgreSQL Database Adapter"
 category = "main"
-optional = false
+optional = true
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
 
 [[package]]
@@ -387,7 +387,7 @@ name = "pyasn1"
 version = "0.4.8"
 description = "ASN.1 types and codecs"
 category = "main"
-optional = false
+optional = true
 python-versions = "*"
 
 [[package]]
@@ -395,7 +395,7 @@ name = "pyasn1-modules"
 version = "0.2.8"
 description = "A collection of ASN.1-based protocols modules."
 category = "main"
-optional = false
+optional = true
 python-versions = "*"
 
 [package.dependencies]
@@ -441,7 +441,7 @@ name = "python-ldap"
 version = "3.3.1"
 description = "Python modules for implementing LDAP clients"
 category = "main"
-optional = false
+optional = true
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
 
 [package.dependencies]
@@ -527,7 +527,7 @@ python-versions = "*"
 
 [[package]]
 name = "sphinx"
-version = "3.4.3"
+version = "3.5.0"
 description = "Python documentation generator"
 category = "dev"
 optional = false
@@ -552,9 +552,9 @@ sphinxcontrib-qthelp = "*"
 sphinxcontrib-serializinghtml = "*"
 
 [package.extras]
-docs = ["sphinxcontrib-websupport"]
-lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.790)", "docutils-stubs"]
+lint = ["docutils-stubs", "flake8 (>=3.5.0)", "isort", "mypy (>=0.800)"]
 test = ["pytest", "pytest-cov", "html5lib", "cython", "typed-ast"]
+docs = ["sphinxcontrib-websupport"]
 
 [[package]]
 name = "sphinx-rtd-theme"
@@ -698,10 +698,15 @@ python-versions = ">=3.6"
 docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
 testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
 
+[extras]
+ldap = ["django-ldapdb"]
+mysql = ["mysqlclient"]
+postgresql = ["psycopg2"]
+
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.6,<4.0"
-content-hash = "2b09b64cff09acd37cc7aef057626140845e0a60f2658a4bf45a6eea443d1b09"
+content-hash = "c914e5f3cc676263f65d9489e9ea748770edb046ec45625424a67375760c791a"
 
 [metadata.files]
 alabaster = [
@@ -1122,8 +1127,8 @@ snowballstemmer = [
     {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"},
 ]
 sphinx = [
-    {file = "Sphinx-3.4.3-py3-none-any.whl", hash = "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8"},
-    {file = "Sphinx-3.4.3.tar.gz", hash = "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c"},
+    {file = "Sphinx-3.5.0-py3-none-any.whl", hash = "sha256:68da66ca3d6b35b22bea5c53d938d5f8988663dca042f0a46429a1eba1010051"},
+    {file = "Sphinx-3.5.0.tar.gz", hash = "sha256:deb468efb3abaa70d790add4147d18782d86fdeacf648d6e8afb7a99807f1546"},
 ]
 sphinx-rtd-theme = [
     {file = "sphinx_rtd_theme-0.5.1-py2.py3-none-any.whl", hash = "sha256:fa6bebd5ab9a73da8e102509a86f3fcc36dec04a0b52ea80e5a033b2aba00113"},
diff --git a/pyproject.toml b/pyproject.toml
index 89381319..008450ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,9 +55,14 @@ python-dateutil = "^2.8.1"
 django-macaddress = "^1.7.0"
 pycrypto = "^2.6.1"
 GitPython = "^3.1.13"
-mysqlclient = {version = "^2.0.3", extras = ["mysql"]}
-psycopg2 = {version = "^2.8.6", extras = ["postgresql"]}
-django-ldapdb = {version = "^1.5.1", extras = ["ldap"]}
+mysqlclient = {version = "^2.0.3", optional=true}
+psycopg2 = {version = "^2.8.6", optional=true}
+django-ldapdb = {version = "^1.5.1", optional=true}
+
+[tool.poetry.extras]
+mysql = ["mysqlclient"]
+postgresql = ["psycopg2"]
+ldap = ["django-ldapdb"]
 
 [tool.poetry.dev-dependencies]
 Sphinx = "^3.4.3"