Use easy_install for distribution

jgraham · jgraham · commit b35cf3d1f075 · 2007-09-30T00:29:55.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401021
diff --git a/setup_base.py b/setup_base.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 import os
 
 long_description="""HTML parser designed to follow the WHATWG HTML5 
@@ -34,5 +34,7 @@
           for name in os.listdir(os.path.join('src','html5lib'))
           if os.path.isdir(os.path.join('src','html5lib',name)) and
               not name.startswith('.')],
-      package_dir = {'html5lib': 'src/html5lib'}
+      package_dir = {'html5lib': 'src/html5lib'},
+      test_suite = "tests.buildTestSuite",
+      tests_require = ['simplejson']
       )
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -0,0 +1 @@
+from runtests import buildTestSuite
diff --git a/tests/runtests.py b/tests/runtests.py
@@ -3,6 +3,12 @@
 import glob
 import unittest
 
+#Allow us to import the parent module
+os.chdir(os.path.split(os.path.abspath(__file__))[0])
+sys.path.insert(0, os.path.abspath(os.curdir))
+sys.path.insert(0, os.path.abspath(os.pardir))
+
+
 def buildTestSuite():
     suite = unittest.TestSuite()
     for testcase in glob.glob('test_*.py'):
@@ -15,11 +21,4 @@ def main():
     if not results.wasSuccessful(): sys.exit(1)
 
 if __name__ == "__main__":
-    #Allow us to import the parent module
-#RELEASE remove
-    sys.path.insert(0,os.path.abspath(os.path.join(__file__,'../../src')))
-#END RELEASE
-    os.chdir(os.path.split(os.path.abspath(__file__))[0])
-    sys.path.insert(0, os.path.abspath(os.pardir))
-
     main()
diff --git a/tests/support.py b/tests/support.py
@@ -9,6 +9,14 @@
 import html5lib
 from html5lib import html5parser, treebuilders
 
+#Define the location of the tests as this changes in release versions
+#RELEASE remove
+test_dir = os.path.join(os.path.pardir,os.path.pardir,'testdata')
+#END RELEASE
+#RELEASE add
+#test_dir = './testdata'
+#END RELEASE
+
 try:
     import simplejson
 except:
@@ -59,7 +67,7 @@ def load(f):
     pass
 
 def html5lib_test_files(subdirectory, files='*.dat'):
-    return glob.glob(os.path.join(os.path.pardir,os.path.pardir,'testdata',subdirectory,files))
+    return glob.glob(os.path.join(test_dir,subdirectory,files))
 
 class DefaultDict(dict):
     def __init__(self, default, *args, **kwargs):
diff --git a/tests/test_encoding.py b/tests/test_encoding.py
@@ -1,6 +1,6 @@
 import os
 import unittest
-from support import html5lib_test_files, TestData
+from support import html5lib_test_files, TestData, test_dir
 
 from html5lib import inputstream
 
@@ -23,7 +23,7 @@ def encodingTest(self, data=test['data'], encoding=test['encoding']):
     try:
         import chardet
         def test_chardet(self):
-            data = open("../../testdata/encoding/chardet/test_big5.txt").read()
+            data = open(os.path.join(test_dir, "/chardet/test_big5.txt")).read()
             encoding = inputstream.HTMLInputStream(data).charEncoding
             assert encoding.lower() == "big5"
         setattr(Html5EncodingTestCase, 'test_chardet', test_chardet)
diff --git a/utils/package.py b/utils/package.py
@@ -14,7 +14,7 @@
 
 class Package(object):
 
-    def __init__(self, inDir, outDir, version=0, status=4, installDir="~"):
+    def __init__(self, inDir, outDir, version="0", status=4, installDir="~"):
         #List of files to remove on exit
         self.version = str(version)
         self.status = str(status)
@@ -28,20 +28,46 @@ def __init__(self, inDir, outDir, version=0, status=4, installDir="~"):
 
     def runall(self):
         self.getFileList()
+        self.copyTestData()
         self.copy()
         self.makeSetupFile()
         self.preprocess()
-        if self.test():
-            self.makeZipFile()
-            self.cleanup()
+        #if self.test():
+        self.makeZipFile()
+        #self.cleanup()
         
 
     def getExcludeList(self):
         rv = []
         for item in exclude:
             rv.append(item.replace("__basedir__", self.inDir))
         return rv
-        
+
+    def copyTestData(self):
+        outDir = "tests/testdata"
+        try:
+            os.mkdir(outDir)
+        except OSError:
+            #the directory already exists    
+            pass
+        inBaseDir = os.path.abspath(os.path.join(self.inDir, "../testdata"))
+        dirWalker = os.walk(inBaseDir)
+        for (curDir, dirs, files) in dirWalker:
+            outDir = os.path.join(self.inDir, "tests", "testdata", curDir[len(inBaseDir)+1:])
+            for dir in dirs[:]:
+                if self.excludeItem(curDir, dir):
+                    dirs.remove(dir)
+                else:
+                    try:
+                        os.mkdir(os.path.join(outDir, dir))
+                    except OSError:
+                        #the directory already exists    
+                        pass
+            for fn in files[:]:
+                if not self.excludeItem(curDir, fn):
+                    newFn = os.path.join(outDir, fn)
+                    shutil.copy(os.path.join(curDir, fn), newFn)
+                    self.cleanupFiles.append(newFn)
     def getFileList(self):
         """Get a list of files to copy"""
         fileList = []
@@ -95,7 +121,6 @@ def copy(self):
             self.outFiles.append(outPath)
             if os.path.isdir(inPath):
                 try:
-                    
                     os.mkdir(outPath)
                 except OSError:
                     #File may already exist
@@ -191,4 +216,13 @@ def add(self, line):
     def move(self, line):
         self.outPath = os.path.abspath(os.path.join(self.inDir,
                                         line[line.find("move")+4:].strip(),
-                                        self.outPath[len(self.inDir)+1:]))
+                                        self.outPath[len(self.inDir)+1:]))
+        dirName = os.path.dirname(self.outPath)
+        if not os.path.exists(dirName):
+            dirsToCreate = []
+            while not os.path.exists(dirName):
+                dirsToCreate.append(dirName)
+                dirName = os.path.dirname(dirName)
+            
+            for item in dirsToCreate[::-1]:
+                os.mkdir(item)
