diff options
author | Kali Kaneko <kali@leap.se> | 2015-08-28 12:10:41 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-08-28 12:10:41 -0400 |
commit | 934aedc932f3d5cbfeacb4d6c2a2faae1e54c390 (patch) | |
tree | fc5d501b22f311acfe185f9e8de9335be01004e4 | |
parent | ccecd1b3750bd10404511c33be1aaca82631a502 (diff) |
[style] pep8 fixes
-rw-r--r-- | setup.cfg | 4 | ||||
-rw-r--r-- | setup.py | 11 |
2 files changed, 8 insertions, 7 deletions
@@ -2,9 +2,9 @@ test = trial [pep8] -exclude = versioneer.py,_version.py,*.egg,build,docs +exclude = versioneer.py,_version.py,*.egg,build,dist,docs ignore = E731 [flake8] -exclude = versioneer.py,_version.py,*.egg,build,docs +exclude = versioneer.py,_version.py,*.egg,build,dist,docs ignore = E731 @@ -19,9 +19,9 @@ setup file for leap.common """ import re from setuptools import setup, find_packages +from setuptools import Command from pkg import utils -parsed_reqs = utils.parse_requirements() import versioneer versioneer.versionfile_source = 'src/leap/common/_version.py' @@ -29,6 +29,8 @@ versioneer.versionfile_build = 'leap/common/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.common-' +parsed_reqs = utils.parse_requirements() + tests_requirements = [ 'mock', ] @@ -61,7 +63,6 @@ if len(_version_short) > 0: DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT cmdclass = versioneer.get_cmdclass() -from setuptools import Command class freeze_debianver(Command): @@ -130,11 +131,11 @@ setup( package_data={'': ['*.pem']}, # For now, we do not exclude tests because of the circular dependency # between leap.common and leap.soledad. - #packages=find_packages('src', exclude=['leap.common.tests']), + # packages=find_packages('src', exclude=['leap.common.tests']), packages=find_packages('src'), test_suite='leap.common.tests', install_requires=parsed_reqs, - #dependency_links=dependency_links, + # dependency_links=dependency_links, tests_require=tests_requirements, include_package_data=True, zip_safe=False, @@ -143,6 +144,6 @@ setup( # needed for leap.common.http # service_identity needed for propper hostname identification, # see http://twistedmatrix.com/documents/current/core/howto/ssl.html - 'Twisted': ["Twisted>=14.0.2", "service_identity", "zope.interface"] + 'Twisted': ["Twisted>=14.0.2", "service_identity", "zope.interface"] }, ) |