rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add cssutils to README and utils/version.py

Browse Source
This commit is contained in:
Daniel 2015-10-08 18:04:53 +02:00
parent 12a9deb9bc
commit 3a2bb2d348
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.asciidoc
View File

@ -100,6 +100,9 @@ The following software and libraries are required to run qutebrowser:
* http://pygments.org/[pygments] * http://pygments.org/[pygments]
* http://pyyaml.org/wiki/PyYAML[PyYAML] * http://pyyaml.org/wiki/PyYAML[PyYAML]
The following libraries are optional and provide a better user experience:
* http://cthedot.de/cssutils/[cssutils]
To generate the documentation for the `:help` command, when using the git To generate the documentation for the `:help` command, when using the git
repository (rather than a release), http://asciidoc.org/[asciidoc] is needed. repository (rather than a release), http://asciidoc.org/[asciidoc] is needed.

1
qutebrowser/utils/version.py
View File

@ -133,6 +133,7 @@ def _module_versions():
('jinja2', ['__version__']), ('jinja2', ['__version__']),
('pygments', ['__version__']), ('pygments', ['__version__']),
('yaml', ['__version__']), ('yaml', ['__version__']),
('cssutils', ['__version__']),
]) ])
for name, attributes in modules.items(): for name, attributes in modules.items():
try: try:

14
tests/unit/utils/test_version.py
View File

@ -324,6 +324,7 @@ class ImportFake:
'jinja2': True, 'jinja2': True,
'pygments': True, 'pygments': True,
'yaml': True, 'yaml': True,
'cssutils': True,
} }
self.version_attribute = '__version__' self.version_attribute = '__version__'
self.version = '1.2.3' self.version = '1.2.3'
@ -383,12 +384,13 @@ class TestModuleVersions:
"""Test with all modules present in version 1.2.3.""" """Test with all modules present in version 1.2.3."""
expected = ['sip: yes', 'colorlog: yes', 'colorama: 1.2.3', expected = ['sip: yes', 'colorlog: yes', 'colorama: 1.2.3',
'pypeg2: 1.2.3', 'jinja2: 1.2.3', 'pygments: 1.2.3', 'pypeg2: 1.2.3', 'jinja2: 1.2.3', 'pygments: 1.2.3',
'yaml: 1.2.3'] 'yaml: 1.2.3', 'cssutils: 1.2.3']
assert version._module_versions() == expected assert version._module_versions() == expected
@pytest.mark.parametrize('module, idx, expected', [ @pytest.mark.parametrize('module, idx, expected', [
('colorlog', 1, 'colorlog: no'), ('colorlog', 1, 'colorlog: no'),
('colorama', 2, 'colorama: no'), ('colorama', 2, 'colorama: no'),
('cssutils', 7, 'cssutils: no'),
]) ])
def test_missing_module(self, module, idx, expected, import_fake): def test_missing_module(self, module, idx, expected, import_fake):
"""Test with a module missing. """Test with a module missing.
@ -404,12 +406,13 @@ class TestModuleVersions:
@pytest.mark.parametrize('value, expected', [ @pytest.mark.parametrize('value, expected', [
('VERSION', ['sip: yes', 'colorlog: yes', 'colorama: 1.2.3', ('VERSION', ['sip: yes', 'colorlog: yes', 'colorama: 1.2.3',
'pypeg2: yes', 'jinja2: yes', 'pygments: yes', 'pypeg2: yes', 'jinja2: yes', 'pygments: yes',
'yaml: yes']), 'yaml: yes', 'cssutils: yes']),
('SIP_VERSION_STR', ['sip: 1.2.3', 'colorlog: yes', 'colorama: yes', ('SIP_VERSION_STR', ['sip: 1.2.3', 'colorlog: yes', 'colorama: yes',
'pypeg2: yes', 'jinja2: yes', 'pygments: yes', 'pypeg2: yes', 'jinja2: yes', 'pygments: yes',
'yaml: yes']), 'yaml: yes', 'cssutils: yes']),
(None, ['sip: yes', 'colorlog: yes', 'colorama: yes', 'pypeg2: yes', (None, ['sip: yes', 'colorlog: yes', 'colorama: yes', 'pypeg2: yes',
'jinja2: yes', 'pygments: yes', 'yaml: yes']), 'jinja2: yes', 'pygments: yes', 'yaml: yes',
'cssutils: yes']),
]) ])
def test_version_attribute(self, value, expected, import_fake): def test_version_attribute(self, value, expected, import_fake):
"""Test with a different version attribute. """Test with a different version attribute.
@ -432,6 +435,9 @@ class TestModuleVersions:
('jinja2', True), ('jinja2', True),
('pygments', True), ('pygments', True),
('yaml', True), ('yaml', True),
pytest.mark.xfail(sys.version_info >= (3, 5), reason='cssutils 1.0 and'
' earlier are broken on Python 3.5')(('cssutils',
True)),
]) ])
def test_existing_attributes(self, name, has_version): def test_existing_attributes(self, name, has_version):
"""Check if all dependencies have an expected __version__ attribute. """Check if all dependencies have an expected __version__ attribute.