From 5a6b67aa0039893c9b2d7f84dd6a09c7a85be23e Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Fri, 30 Aug 2024 18:23:44 -0400
Subject: [PATCH 1/3] chore: move dev deps into `project.optional-dependencies`

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
 pyproject.toml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index e7a3e8d..526b491 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,11 +33,6 @@ dependencies = [
   "parsedatetime",
   "python-dateutil",
   "truststore",
-  # dev dependencies
-  "google-api-python-client-stubs",
-  "types-python-dateutil",
-  "types-requests",
-  "types-vobject",
 ]
 
 [project.urls]
@@ -47,6 +42,12 @@ Changelog = "https://github.com/insanum/gcalcli/blob/HEAD/ChangeLog"
 
 [project.optional-dependencies]
 vobject = ["vobject"]
+dev = [
+  "google-api-python-client-stubs",
+  "types-python-dateutil",
+  "types-requests",
+  "types-vobject",
+]
 
 [tool.setuptools]
 packages = ["gcalcli"]

From 487037d5746d8a6b3b74a0f0b400121338726ba5 Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Fri, 30 Aug 2024 18:26:14 -0400
Subject: [PATCH 2/3] reorder optional deps

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 526b491..09a8b41 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,13 +41,13 @@ Issues = "https://github.com/insanum/gcalcli/issues"
 Changelog = "https://github.com/insanum/gcalcli/blob/HEAD/ChangeLog"
 
 [project.optional-dependencies]
-vobject = ["vobject"]
 dev = [
   "google-api-python-client-stubs",
   "types-python-dateutil",
   "types-requests",
   "types-vobject",
 ]
+vobject = ["vobject"]
 
 [tool.setuptools]
 packages = ["gcalcli"]

From c173032a95b2b415979a6bbc9112d3d9b3ef9b7b Mon Sep 17 00:00:00 2001
From: David Barnett <david@mumind.me>
Date: Sun, 1 Sep 2024 23:12:06 -0600
Subject: [PATCH 3/3] Fix tests after moving dev deps to [dev], add note in
 CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++++
 tox.ini         | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cad7652..e12efe9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,4 +44,8 @@ git submodule update --init
 tox
 ```
 
+NOTE: You'll also want to install the "dev" extra in any development environment you're using
+that's not managed by tox (by changing install commands `gcalcli`->`gcalcli[dev]` or
+`.`->`.[dev]`).
+
 See [tests/README.md](tests/README.md) for more info on the tests.
diff --git a/tox.ini b/tox.ini
index b92523d..ea2d53a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,11 +4,12 @@ requires =
 envlist = lint, type, py3{10,11,12}, cli
 
 [testenv]
-usedevelop=true
+usedevelop = true
 deps = pytest
        pytest-cov
        coverage
        vobject
+extras = dev
 
 commands=py.test -vv --cov=./gcalcli --pyargs tests {posargs}
          coverage html