From efb0b5bc5ea1ac70e462691ed4228218ff620874 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Mon, 26 Feb 2024 01:29:53 +0100
Subject: [PATCH 1/2] Move extras_require to setup.cfg

---
 setup.cfg | 4 ++++
 setup.py  | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3dc9df1a..f9b52f41 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,6 +34,10 @@ packages =
 console_scripts =
     bimmerconnected = bimmer_connected.cli:main
 
+[options.extras_require]
+china =
+    Pillow
+
 [options.package_data]
 bimmer_connected =
     py.typed
diff --git a/setup.py b/setup.py
index 941acadf..5f2e7a1b 100644
--- a/setup.py
+++ b/setup.py
@@ -9,9 +9,4 @@
         "pycryptodome>=3.4",
         "pyjwt>=2.1.0",
     ],
-    extras_require={
-        "china": [
-            "Pillow",
-        ],
-    },
 )

From e832b8cc57422424c224acd45b4ae5bfb022152a Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 3 Mar 2024 19:53:14 +0100
Subject: [PATCH 2/2] Move install_requires to setup.cfg

---
 setup.cfg | 6 ++++++
 setup.py  | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f9b52f41..257077f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,6 +34,12 @@ packages =
 console_scripts =
     bimmerconnected = bimmer_connected.cli:main
 
+[options]
+install_requires =
+    httpx
+    pycryptodome>=3.4
+    pyjwt>=2.1.0
+
 [options.extras_require]
 china =
     Pillow
diff --git a/setup.py b/setup.py
index 5f2e7a1b..481f0982 100644
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,4 @@
 setup(
     setup_requires=["pbr"],
     pbr=True,
-    install_requires=[
-        "httpx",
-        "pycryptodome>=3.4",
-        "pyjwt>=2.1.0",
-    ],
 )