Fix compiledcode imports and dependencies

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

binary-analysis/scancode-compiledcode/setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='compiledcode',
-    version='2.0.0',
+    version='2.1.0',
     license='Apache-2.0',
     description=desc,
     long_description=desc,
@@ -39,12 +39,17 @@
         'open source', 'scancode', 'dwarf', 'lkmclue', 'elf', 'cpp includes', 'gwt',
     ],
     install_requires=[
-        'scancode-toolkit',
-        'attr',
+        'commoncode',
+        'plugincode',
+        'typecode',
+        'attrs',
         'pyelftools',
     ],
 
     extra_requires={
+        'full': [
+            'scancode-toolkit',
+        ],
         'binary': [
             'scancode-ctags',
             'scancode-dwarfdump',

binary-analysis/scancode-compiledcode/src/compiledcode/dwarf/__init__.py

@@ -16,10 +16,10 @@
 import attr
 
 from commoncode import fileutils
-from plugincode.scan import ScanPlugin
-from plugincode.scan import scan_impl
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import SCAN_GROUP
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
 from typecode import contenttype
 
 from compiledcode.dwarf import dwarf

binary-analysis/scancode-compiledcode/src/compiledcode/elf/__init__.py

@@ -14,10 +14,10 @@
 import attr
 
 from commoncode import fileutils
-from plugincode.scan import ScanPlugin
-from plugincode.scan import scan_impl
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import SCAN_GROUP
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
 from typecode import contenttype
 
 from compiledcode.elf.elf import Elf

binary-analysis/scancode-compiledcode/src/compiledcode/gwt/__init__.py

@@ -15,10 +15,10 @@
 
 import attr
 
-from plugincode.scan import ScanPlugin
-from plugincode.scan import scan_impl
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import SCAN_GROUP
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
 from textcode import analysis
 from typecode import contenttype
 

binary-analysis/scancode-compiledcode/src/compiledcode/lkmclue/__init__.py

@@ -14,10 +14,10 @@
 import attr
 
 from commoncode import fileutils
-from plugincode.scan import ScanPlugin
-from plugincode.scan import scan_impl
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import SCAN_GROUP
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
 from typecode import contenttype
 
 from compiledcode.sourcecode import kernel

binary-analysis/scancode-compiledcode/src/compiledcode/sourcecode/__init__.py

@@ -14,10 +14,10 @@
 import attr
 
 from commoncode import fileutils
-from plugincode.scan import ScanPlugin
-from plugincode.scan import scan_impl
 from commoncode.cliutils import PluggableCommandLineOption
 from commoncode.cliutils import SCAN_GROUP
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
 from typecode import contenttype
 
 from compiledcode.sourcecode import kernel