Merge pull request #3118 from ximenesuk/flake8-omerofs

Flake8 OmeroFS
ome · Oct 27, 2014 · 1c19755 · 1c19755
2 parents b19618c + 8ccd73d
commit 1c19755
Show file tree

Hide file tree

Showing 19 changed files with 1,488 additions and 1,148 deletions.
diff --git a/components/tools/OmeroFS/build.xml b/components/tools/OmeroFS/build.xml
@@ -22,6 +22,7 @@
     <dirname property="up-two" file="${basedir}"/>
     <dirname property="up-one" file="${up-two}"/>
     <property name="import.dir"       value="${up-one}/antlib/resources"/>
+    <property name="copy.dir"         value="target"/>
 
     <import file="${import.dir}/global.xml"/>
     <import file="${import.dir}/version.xml"/>
@@ -32,12 +33,19 @@
 
     <target name="integration" depends="python-integration" unless="env.NOPYTHON"/>
 
-    <target name="tools-init" unless="env.NOPYTHON"/>
+    <target name="tools-init" unless="env.NOPYTHON">
+        <copy todir="${copy.dir}">
+            <fileset dir="src" includes="*.py"/>
+        </copy>
+    </target>
 
     <target name="tools-build" depends="tools-init,python-build" description="Creates all artifacts for tools/target" unless="env.NOPYTHON"/>
 
     <target name="tools-dist" depends="tools-build,python-install" description="Copied artifacts to tools/target" unless="env.NOPYTHON"/>
 
-    <target name="tools-clean" depends="python-clean"/>
+    <target name="tools-clean" depends="python-clean">
+        <delete dir="${copy.dir}"/>
+        <delete dir="${basedir}/build"/>
+    </target>
 
 </project>
diff --git a/components/tools/OmeroFS/setup.py b/components/tools/OmeroFS/setup.py
@@ -12,7 +12,7 @@
 
 for tools in glob.glob("../../../lib/repository/setuptools*.egg"):
     if tools.find(".".join(map(str, sys.version_info[0:2]))) > 0:
-       sys.path.insert(0, tools)
+       sys.path.insert(0, os.path.abspath(tools))
 
 sys.path.append("..")
 from test_setup import PyTest
@@ -32,7 +32,9 @@
       author_email="",
       url="http://trac.openmicroscopy.org.uk/ome/wiki/OmeroFs",
       download_url="http://trac.openmicroscopy.org.uk/ome/wiki/OmeroFs",
+      package_dir={"": "target"},
       packages=[''],
       cmdclass = {'test': PyTest},
+      tests_require=['pytest'],
 )
 
diff --git a/...ools/OmeroFS/fsAbstractPlatformMonitor.py → .../OmeroFS/src/fsAbstractPlatformMonitor.py b/...ools/OmeroFS/fsAbstractPlatformMonitor.py → .../OmeroFS/src/fsAbstractPlatformMonitor.py
@@ -9,21 +9,24 @@
 """
 import threading
 
+
 class AbstractPlatformMonitor(threading.Thread):
+
     """
         A Thread to monitor a path.
-        
+
         :group Constructor: __init__
         :group Other methods: run, stop
 
     """
 
-    def __init__(self, eventTypes, pathMode, pathString, whitelist, blacklist, ignoreSysFiles, ignoreDirEvents, proxy):
+    def __init__(self, eventTypes, pathMode, pathString, whitelist, blacklist,
+                 ignoreSysFiles, ignoreDirEvents, proxy):
         """
             Set-up Monitor thread.
         """
         threading.Thread.__init__(self)
-        
+
         self.eTypes = []
         for eT in eventTypes:
             self.eTypes.append(str(eT))
@@ -35,43 +38,40 @@ def __init__(self, eventTypes, pathMode, pathString, whitelist, blacklist, ignor
         self.ignoreSysFiles = ignoreSysFiles
         self.ignoreDirEvents = ignoreDirEvents
         self.proxy = proxy
-                
+
     def run(self):
         """
             Start monitoring.
-            
+
             :return: No explicit return value.
         """
         # pass
-        
-    def stop(self):        
+
+    def stop(self):
         """
-            Stop monitoring 
-            
+            Stop monitoring
+
             :return: No explicit return value.
         """
         # pass
-        
+
     def propagateEvents(self, eventList):
         """
             Propagate events to proxy.
-        
+
             :Parameters:
-                    
+
                 eventPath : List
                     events.
-                    
+
             :return: No explicit return value.
-            
+
         """
         if len(eventList) > 0:
-            try:          
+            try:
                 self.log.info('Event notification : %s', str(eventList))
                 self.proxy.callback(eventList)
             except:
                 self.log.exception("Notification failed : ")
         else:
-            self.log.info('No notifications propagated')    
-
-
-
+            self.log.info('No notifications propagated')