diff options
| -rw-r--r-- | pkg/utils/reqs.py | 4 | ||||
| -rw-r--r-- | setup.cfg | 10 | ||||
| -rw-r--r-- | setup.py | 8 | ||||
| -rw-r--r-- | src/leap/mx/check_recipient_access.py | 2 | ||||
| -rw-r--r-- | src/leap/mx/tcp_map.py | 1 | ||||
| -rw-r--r-- | src/leap/mx/tests/__init__.py | 1 |
6 files changed, 16 insertions, 10 deletions
diff --git a/pkg/utils/reqs.py b/pkg/utils/reqs.py index f10051e..251c7e9 100644 --- a/pkg/utils/reqs.py +++ b/pkg/utils/reqs.py @@ -67,8 +67,8 @@ def parse_requirements(reqfiles=['requirements.txt', if re.match(r'\s*-e\s+', line): pass # do not try to do anything with externals on vcs - #requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', - #line)) + # requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', r'\1', + # line)) # http://foo.bar/baz/foobar/zipball/master#egg=foobar elif re.match(r'\s*https?:', line): requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', r'\1', diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..4a2ab2b --- /dev/null +++ b/setup.cfg @@ -0,0 +1,10 @@ +[aliases] +test = trial + +[pep8] +exclude = versioneer.py,_version.py,*.egg,build,dist,docs +ignore = E731 + +[flake8] +exclude = versioneer.py,_version.py,*.egg,build,dist,docs +ignore = E731 @@ -20,6 +20,9 @@ setup file for leap.mx import os import re from setuptools import setup, find_packages +from setuptools import Command + +from pkg.utils.reqs import parse_requirements, is_develop_mode import versioneer versioneer.versionfile_source = 'src/leap/mx/_version.py' @@ -27,8 +30,6 @@ versioneer.versionfile_build = 'leap/mx/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.mx-' -from pkg.utils.reqs import parse_requirements, is_develop_mode - trove_classifiers = [ 'Development Status :: 3 - Alpha', 'Environment :: No Input/Output (Daemon)', @@ -60,9 +61,6 @@ if len(_version_short) > 0: cmdclass = versioneer.get_cmdclass() -from setuptools import Command - - class freeze_debianver(Command): """ Freezes the version in a debian branch. diff --git a/src/leap/mx/check_recipient_access.py b/src/leap/mx/check_recipient_access.py index 070ff0d..67bfd04 100644 --- a/src/leap/mx/check_recipient_access.py +++ b/src/leap/mx/check_recipient_access.py @@ -43,7 +43,6 @@ class LEAPPostFixTCPMapAccessServer(postfix.PostfixTCPMapServer): are looked up by the factory, and will return a permanent or a temporary failure in case either the user or the key don't exist, respectivelly. """ - def _cbGot(self, value): """ Return a code and message depending on the result of the factory's @@ -85,4 +84,3 @@ class CheckRecipientAccessFactory(LEAPPostfixTCPMapServerFactory): @property def _query_message(self): return "check recipient access" - diff --git a/src/leap/mx/tcp_map.py b/src/leap/mx/tcp_map.py index 96db70a..07bf51d 100644 --- a/src/leap/mx/tcp_map.py +++ b/src/leap/mx/tcp_map.py @@ -41,7 +41,6 @@ class LEAPPostfixTCPMapServerFactory(ServerFactory, object): __metaclass__ = ABCMeta - def __init__(self, couchdb): """ Initialize the factory. diff --git a/src/leap/mx/tests/__init__.py b/src/leap/mx/tests/__init__.py index 2002c48..13df919 100644 --- a/src/leap/mx/tests/__init__.py +++ b/src/leap/mx/tests/__init__.py @@ -22,6 +22,7 @@ code, using twisted.trial, for testing leap_mx. __all__ = ['test_alias_resolver'] + def run(): """xxx fill me in""" pass |