Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added toml as extra #410

Merged
merged 7 commits into from Mar 24, 2021
Merged

Added toml as extra #410

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ff93b1
added toml extra
Cielquan Jun 3, 2020
96c9b84
Update AUTHORS.rst
Cielquan Jun 3, 2020
36ff090
Update CHANGELOG.rst
Cielquan Jun 3, 2020
4e6b51f
chain toml dependency to coverage's toml dependency
Cielquan Mar 22, 2021
a3a6a34
Merge branch 'master' into master
Cielquan Mar 22, 2021
c0eec9f
move coverage's toml dependency from extras to install_requires
Cielquan Mar 23, 2021
93fabe6
udpate changelog phrase
Cielquan Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.rst
View file
Open in desktop
Expand Up @@ -44,3 +44,4 @@ Authors
* Michał Górny - https://github.com/mgorny
* Bernát Gábor - https://github.com/gaborbernat
* Pamela McA'Nulty - https://github.com/PamelaM
* Christian Riedel - https://github.com/Cielquan
7 changes: 7 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
@@ -1,6 +1,13 @@
Changelog
=========


2.12.0 (2021-03-??)
-------------------

* Addded `toml` extra to setup.py, which is chained to coverage's `toml` extra.
Contributed by Christian Riedel in `#410 <https://github.com/pytest-dev/pytest-cov/pull/410>`_.

2.11.1 (2021-01-20)
-------------------

Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -135,7 +135,8 @@ def run(self):
'six',
'pytest-xdist',
'virtualenv',
]
],
'toml': ['coverage[toml] >= 5'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the >=5 part redundant? It's already specified more precisely in install_requires.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I don't know.

},
entry_points={
'pytest11': [
Expand Down