diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2017-10-17 19:48:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-17 19:48:45 +0300 |
commit | cfa2eff733e54abdf5d6aa07e53821f067d0d4de (patch) | |
tree | 03e7011ab38b39f7a86df64319a0198a79499a0f /setup.py | |
parent | 3369d9a03a9f1e173ed3b8281a50f4d52eb39fce (diff) | |
parent | 67753b7ce38e4ab6dab1377e37e9d1bce0364291 (diff) |
Merge pull request #4120 from stephenfin/the-great-toxification-4
The great toxification (part 4)
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -69,19 +69,19 @@ extras_require = { ], 'test': [ 'pytest', - 'mock', # it would be better for 'test:python_version in 2.7' - 'simplejson', # better: 'test:platform_python_implementation=="PyPy"' + 'pytest-cov', 'html5lib', ], + 'test:python_version<"3"': [ + 'enum34', + 'mock', + ], + 'test:python_version>="3"': [ + 'mypy', + 'typed_ast', + ], } -# for sdist installation with pip-1.5.6 -if sys.platform == 'win32': - requires.append('colorama>=0.3.5') - -if sys.version_info < (3, 5): - requires.append('typing') - # Provide a "compile_catalog" command that also creates the translated # JavaScript files if Babel is available. @@ -90,10 +90,7 @@ cmdclass = {} try: from babel.messages.pofile import read_po from babel.messages.frontend import compile_catalog - try: - from simplejson import dump - except ImportError: - from json import dump + from json import dump except ImportError: pass else: |