Merge pull request #5 from jluebbe/dev

improve script performance and refactor resource/udev

MANIFEST.in

@@ -0,0 +1 @@
+include fastentrypoints.py

fastentrypoints.py

@@ -0,0 +1,107 @@
+# Copyright (c) 2016, Aaron Christianson
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'''
+Monkey patch setuptools to write faster console_scripts with this format:
+
+ import sys
+ from mymodule import entry_function
+ sys.exit(entry_function())
+
+This is better.
+
+(c) 2016, Aaron Christianson
+https://github.com/ninjaaron/fast-entry_points
+'''
+from setuptools.command import easy_install
+import re
+TEMPLATE = '''\
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from {0} import {1}
+
+if __name__ == '__main__':
+ sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+ sys.exit({2}())'''
+
+
+@classmethod
+def get_args(cls, dist, header=None):
+ """
+ Yield write_script() argument tuples for a distribution's
+ console_scripts and gui_scripts entry points.
+ """
+ if header is None:
+ header = cls.get_header()
+ spec = str(dist.as_requirement())
+ for type_ in 'console', 'gui':
+ group = type_ + '_scripts'
+ for name, ep in dist.get_entry_map(group).items():
+ # ensure_safe_name
+ if re.search(r'[\\/]', name):
+ raise ValueError("Path separators not allowed in script names")
+ script_text = TEMPLATE.format(
+ ep.module_name, ep.attrs[0], '.'.join(ep.attrs))
+ args = cls._get_script_args(type_, name, header, script_text)
+ for res in args:
+ yield res
+
+
+easy_install.ScriptWriter.get_args = get_args
+
+
+def main():
+ import os
+ import re
+ import shutil
+ import sys
+ dests = sys.argv[1:] or ['.']
+ filename = re.sub('\.pyc$', '.py', __file__)
+
+ for dst in dests:
+ shutil.copy(filename, dst)
+ manifest_path = os.path.join(dst, 'MANIFEST.in')
+ setup_path = os.path.join(dst, 'setup.py')
+
+ # Insert the include statement to MANIFEST.in if not present
+ with open(manifest_path, 'a+') as manifest:
+ manifest.seek(0)
+ manifest_content = manifest.read()
+ if not 'include fastentrypoints.py' in manifest_content:
+ manifest.write(('\n' if manifest_content else '')
+ + 'include fastentrypoints.py')
+
+ # Insert the import statement to setup.py if not present
+ with open(setup_path, 'a+') as setup:
+ setup.seek(0)
+ setup_content = setup.read()
+ if not 'import fastentrypoints' in setup_content:
+ setup.seek(0)
+ setup.truncate()
+ setup.write('import fastentrypoints\n' + setup_content)
+
+print(__name__)

labgrid/resource/udev.py

@@ -72,6 +72,16 @@ def device(self, value):
  self._device = value
  self.on_device_set()
 
+ @property
+ def busnum(self):
+ if self._device:
+ return int(self.device.get('BUSNUM'))
+
+ @property
+ def devnum(self):
+ if self._device:
+ return int(self.device.get('DEVNUM'))
+
 
 @target_factory.reg_resource
 @attr.s
@@ -113,12 +123,6 @@ def try_match(self, device):
  def on_device_set(self):
  self.avail = True
 
- @property
- def busnum(self):
- return int(self.device.get_property('BUSNUM'))
-
- def devnum(self):
- return int(self.device.get_property('DEVNUM'))
 
 @target_factory.reg_resource
 @attr.s
@@ -134,14 +138,6 @@ def try_match(self, device):
  def on_device_set(self):
  self.avail = True
 
- @property
- def busnum(self):
- return int(self.device.get('BUSNUM'))
-
- @property
- def devnum(self):
- return int(self.device.get('DEVNUM'))
-
 @target_factory.reg_resource
 @attr.s
 class AndroidFastboot(USBResource):
@@ -156,11 +152,3 @@ def try_match(self, device):
 
  def on_device_set(self):
  self.avail = True
-
- @property
- def busnum(self):
- return int(self.device.get('BUSNUM'))
-
- @property
- def devnum(self):
- return int(self.device.get('DEVNUM'))

labgrid/stepreporter.py

@@ -1,5 +1,3 @@
-import pytest
-
 from .step import steps
 
 

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import fastentrypoints
 
 from setuptools import setup