From 2ff93b1e5313ddd1af3ec8ec9439798256f3b9b3 Mon Sep 17 00:00:00 2001 From: Christian Riedel Date: Wed, 3 Jun 2020 11:14:23 +0200 Subject: [PATCH 1/6] added toml extra --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 464a52ec..ca62e325 100644 --- a/setup.py +++ b/setup.py @@ -134,7 +134,8 @@ def run(self): 'six', 'pytest-xdist', 'virtualenv', - ] + ], + 'toml': ['toml'], }, entry_points={ 'pytest11': [ From 96c9b84195d01648166b9131d50dfe23d389d7ec Mon Sep 17 00:00:00 2001 From: Christian Riedel Date: Wed, 3 Jun 2020 11:17:57 +0200 Subject: [PATCH 2/6] Update AUTHORS.rst --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index dfd2c83c..f78f7970 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -38,3 +38,4 @@ Authors * Hugo van Kemenade - https://github.com/hugovk * Michael Manganiello - https://github.com/adamantike * Anders Hovmöller - https://github.com/boxed +* Christian Riedel - https://github.com/Cielquan From 36ff090bd0b71bc18a03dbd1d8c2a431fd376b19 Mon Sep 17 00:00:00 2001 From: Christian Riedel Date: Wed, 3 Jun 2020 11:32:44 +0200 Subject: [PATCH 3/6] Update CHANGELOG.rst --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 01d87c83..deac38ea 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +2.10.0 (2020-06-??) +------------------- +* Addded `toml` extra to setup.py. + Contributed by Christian Riedel in `#410 `_. + 2.9.0 (2020-05-22) ------------------ From 4e6b51fbd622775e27eda3541e2eeb035239c6e3 Mon Sep 17 00:00:00 2001 From: Christian Riedel Date: Mon, 22 Mar 2021 06:54:15 +0100 Subject: [PATCH 4/6] chain toml dependency to coverage's toml dependency Co-authored-by: Thomas Grainger --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ca62e325..163d60a8 100644 --- a/setup.py +++ b/setup.py @@ -135,7 +135,7 @@ def run(self): 'pytest-xdist', 'virtualenv', ], - 'toml': ['toml'], + 'toml': ['coverage[toml] >= 5'], }, entry_points={ 'pytest11': [ From c0eec9f93848cdeae3d895b8530b346754237c0a Mon Sep 17 00:00:00 2001 From: Christian Riedel Date: Tue, 23 Mar 2021 17:26:01 +0100 Subject: [PATCH 5/6] move coverage's toml dependency from extras to install_requires --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 0948aebf..a00ae0af 100755 --- a/setup.py +++ b/setup.py @@ -124,7 +124,7 @@ def run(self): ], install_requires=[ 'pytest>=4.6', - 'coverage>=5.2.1' + 'coverage[toml]>=5.2.1' ], python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*', extras_require={ @@ -135,8 +135,7 @@ def run(self): 'six', 'pytest-xdist', 'virtualenv', - ], - 'toml': ['coverage[toml] >= 5'], + ] }, entry_points={ 'pytest11': [ From 93fabe68167168c063cd5a847642f2a1d6ae6963 Mon Sep 17 00:00:00 2001 From: Christian Riedel Date: Tue, 23 Mar 2021 17:27:13 +0100 Subject: [PATCH 6/6] udpate changelog phrase --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 021763d1..904fa0d8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,7 +5,7 @@ Changelog 2.12.0 (2021-03-??) ------------------- -* Addded `toml` extra to setup.py, which is chained to coverage's `toml` extra. +* Added coverage's `toml` extra to install requirements in setup.py. Contributed by Christian Riedel in `#410 `_. 2.11.1 (2021-01-20)