Skip to content

Commit 66c7c82

Browse files
authored
Merge pull request #5 from click-contrib/click-sphinx-workaround
sphinx-click a temporary workaround
2 parents c7cb9b5 + f9a20b7 commit 66c7c82

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v0.3.1
4+
5+
* Add `hidden=True` to `_GroupTitleFakeOption` as a temporary workaroud for issue [#4](https://github.com/click-contrib/click-option-group/issues/4)
6+
37
## v0.3.0
48
* Add support for hidden options inside groups (PR [#2](https://github.com/click-contrib/click-option-group/pull/2))
59

click_option_group/_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class _GroupTitleFakeOption(click.Option):
6868

6969
def __init__(self, param_decls=None, *, group: 'OptionGroup', **attrs):
7070
self.__group = group
71-
super().__init__(param_decls, expose_value=False, **attrs)
71+
super().__init__(param_decls, hidden=True, expose_value=False, help=group.help, **attrs)
7272

7373
def get_help_record(self, ctx: click.Context):
7474
return self.__group.get_help_record(ctx)

click_option_group/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22

3-
__version__ = '0.3.0'
3+
__version__ = '0.3.1'

tests/test_click_option_group.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ def cli(foo, bar):
261261
assert result.exception
262262
assert result.exit_code == 2
263263
assert 'Missing one of the required options' in result.output
264-
assert '"--foo"' in result.output
265-
assert '"--bar"' in result.output
264+
assert '--foo' in result.output
265+
assert '--bar' in result.output
266266

267267
result = runner.invoke(cli, ['--foo', 'foo'])
268268
assert not result.exception
@@ -298,22 +298,22 @@ def cli(foo, bar):
298298
assert result.exception
299299
assert result.exit_code == 2
300300
assert 'Missing required options from' in result.output
301-
assert '"--foo"' in result.output
302-
assert '"--bar"' in result.output
301+
assert '--foo' in result.output
302+
assert '--bar' in result.output
303303

304304
result = runner.invoke(cli, ['--foo', 'foo'])
305305
assert result.exception
306306
assert result.exit_code == 2
307307
assert 'Missing required options from' in result.output
308-
assert '"--foo"' not in result.output
309-
assert '"--bar"' in result.output
308+
assert '--foo' not in result.output
309+
assert '--bar' in result.output
310310

311311
result = runner.invoke(cli, ['--bar', 'bar'])
312312
assert result.exception
313313
assert result.exit_code == 2
314314
assert 'Missing required options from' in result.output
315-
assert '"--foo"' in result.output
316-
assert '"--bar"' not in result.output
315+
assert '--foo' in result.output
316+
assert '--bar' not in result.output
317317

318318
result = runner.invoke(cli, ['--foo', 'foo', '--bar', 'bar'])
319319
assert not result.exception
@@ -345,22 +345,22 @@ def cli(foo, bar, spam):
345345
assert result.exception
346346
assert result.exit_code == 2
347347
assert 'The given mutually exclusive options cannot be used at the same time' in result.output
348-
assert '"--foo"' in result.output
349-
assert '"--bar"' in result.output
348+
assert '--foo' in result.output
349+
assert '--bar' in result.output
350350

351351
result = runner.invoke(cli, ['--foo', 'foo', '--spam', 'spam'])
352352
assert result.exception
353353
assert result.exit_code == 2
354354
assert 'The given mutually exclusive options cannot be used at the same time' in result.output
355-
assert '"--foo"' in result.output
356-
assert '"--spam"' in result.output
355+
assert '--foo' in result.output
356+
assert '--spam' in result.output
357357

358358
result = runner.invoke(cli, ['--bar', 'bar', '--spam', 'spam'])
359359
assert result.exception
360360
assert result.exit_code == 2
361361
assert 'The given mutually exclusive options cannot be used at the same time' in result.output
362-
assert '"--bar"' in result.output
363-
assert '"--spam"' in result.output
362+
assert '--bar' in result.output
363+
assert '--spam' in result.output
364364

365365
result = runner.invoke(cli, ['--foo', 'foo'])
366366
assert not result.exception
@@ -397,9 +397,9 @@ def cli(foo, bar, spam):
397397
assert result.exception
398398
assert result.exit_code == 2
399399
assert 'Missing one of the required mutually exclusive options' in result.output
400-
assert '"--foo"' in result.output
401-
assert '"--bar"' in result.output
402-
assert '"--spam"' in result.output
400+
assert '--foo' in result.output
401+
assert '--bar' in result.output
402+
assert '--spam' in result.output
403403

404404

405405
@pytest.mark.parametrize('cls', [

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ envlist = py{36,37,38}-pytest-coverage, flake8
33

44
[testenv]
55
deps = pytest
6-
commands = pytest --color=yes {posargs}
6+
commands = pytest --color=yes -v {posargs}
77

88
[testenv:py37-pytest-coverage]
99
usedevelop = true
@@ -14,7 +14,7 @@ deps =
1414
pytest-cov
1515
coveralls
1616
commands =
17-
pytest --cov=click_option_group --color=yes {posargs}
17+
pytest --cov=click_option_group --color=yes -v {posargs}
1818
coveralls
1919

2020
[testenv:flake8]

0 commit comments

Comments
 (0)