瀏覽代碼

fixed setup and tests

Simon Van Mierlo 5 年之前
父節點
當前提交
1942a46c82

+ 2 - 0
src/MANIFEST.in

@@ -0,0 +1,2 @@
+include sccd/action_lang/parser/action_lang.g
+include sccd/statechart/parser/statechart.g

+ 0 - 0
src/sccd/action_lang/cmd/__init__.py


+ 0 - 0
src/sccd/action_lang/parser/__init__.py


+ 0 - 0
src/sccd/cd/parser/__init__.py


+ 0 - 0
src/sccd/cd/static/__init__.py


+ 0 - 0
src/sccd/test/__init__.py


+ 7 - 6
src/sccd/test/run.py

@@ -3,18 +3,19 @@ import unittest
 import threading
 import queue
 import functools
-from sccd.util.os_tools import *
-from sccd.util.debug import *
-from sccd.cd.static.cd import *
-from sccd.controller.controller import *
-from sccd.test.xml import *
-from sccd.util import timer
 
 import sys
 if sys.version_info.minor >= 7:
   QueueImplementation = queue.SimpleQueue
 else:
   QueueImplementation = queue.Queue
+sys.path.append("..")
+from util.os_tools import *
+from util.debug import *
+from cd.static.cd import *
+from controller.controller import *
+from xml import *
+from util import timer
 
 # A TestCase loading and executing a statechart test file.
 class Test(unittest.TestCase):

+ 3 - 17
src/setup.py

@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup, find_packages
 
 setup(name="sccd",
       version="1.0.0",
@@ -6,20 +6,6 @@ setup(name="sccd",
       author="Simon Van Mierlo",
       author_email="Simon.VanMierlo@uantwerpen.be",
       url="http://msdl.cs.mcgill.ca/people/simonvm",
-      packages=[
-        'sccd',
-        'sccd.action_lang',
-        'sccd.action_lang.cmd',
-        'sccd.action_lang.dynamic',
-        'sccd.action_lang.parser',
-        'sccd.action_lang.static',
-        'sccd.controller',
-        'sccd.model',
-        'sccd.statechart',
-        'sccd.statechart.cmd',
-        'sccd.statechart.dynamic',
-        'sccd.statechart.parser',
-        'sccd.statechart.static',
-        'sccd.util',
-      ]
+      packages=find_packages(exclude=['sccd.test']),
+      include_package_data=True
 )