Random changes to the build script and so on

jgraham · jgraham · commit 2530b065bd72 · 2008-06-10T21:41:35.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401173
diff --git a/setup.py b/setup.py
@@ -1,4 +1,7 @@
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 import os
 
 long_description="""HTML parser designed to follow the WHATWG HTML5 
@@ -7,11 +10,11 @@
 with the behaviour of major desktop web browsers.
 
 Output is to a tree structure; the current release supports output to
-a custom tree similar to DOM and to ElementTree.
-"""
+DOM, ElementTree, lxml and BeautifulSoup tree formats as well as a
+simple custom format"""
 
 classifiers=[
-    'Development Status :: 3 - Alpha',
+    'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Operating System :: OS Independent',
@@ -21,7 +24,7 @@
     ],
 
 setup(name='html5lib',
-      version='0.3',
+      version='0.11',
       url='http://code.google.com/p/html5lib/',
       license="MIT License",
       description='HTML parser based on the WHAT-WG Web Applications 1.0' 
@@ -34,5 +37,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/setup_base.py b/setup_base.py
@@ -7,8 +7,8 @@
 with the behaviour of major desktop web browsers.
 
 Output is to a tree structure; the current release supports output to
-a custom tree similar to DOM and to ElementTree.
-"""
+DOM, ElementTree, lxml and BeautifulSoup tree formats as well as a
+simple custom format"""
 
 classifiers=[
     'Development Status :: %(status)s',
@@ -34,7 +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 = {'': 'src/'},
       test_suite = "tests.buildTestSuite",
       tests_require = ['simplejson']
       )
diff --git a/utils/package.py b/utils/package.py
@@ -23,6 +23,7 @@ def __init__(self, inDir, outDir, version="0", status=4, installDir="~"):
         self.inDir = os.path.abspath(inDir)
         self.outDir = os.path.abspath(outDir)
         self.exclude = self.getExcludeList()
+        print self.exclude
         self.fileList = self.getFileList()
         self.installDir = installDir
         self.outFiles = []
@@ -45,12 +46,15 @@ def getExcludeList(self):
         return rv
 
     def copyTestData(self):
-        outDir = "tests/testdata"
+        outDir = os.path.join(self.inDir, "tests/testdata")
+        print 
         try:
             os.mkdir(outDir)
         except OSError:
-            #the directory already exists    
-            pass
+            #the directory already exists
+            if not os.path.exists(outDir):
+                raise
+            
         inBaseDir = os.path.abspath(os.path.join(self.inDir, "../testdata"))
         dirWalker = os.walk(inBaseDir)
         for (curDir, dirs, files) in dirWalker:
@@ -152,7 +156,8 @@ def test(self):
     
     def makeZipFile(self):
         z = zipfile.ZipFile(os.path.join(self.outDir,
-                                         "html5lib-%s.zip"%self.version), 'w')
+                                         "html5lib-%s.zip"%self.version), 'w',
+                            zipfile.ZIP_DEFLATED)
         for f in self.outFiles:
             z.write(f, os.path.join("html5lib-%s"%self.version,
                                     f[len(self.outDir)+1:]))
@@ -226,4 +231,4 @@ def move(self, line):
                 dirName = os.path.dirname(dirName)
             
             for item in dirsToCreate[::-1]:
-                os.mkdir(item)
+                os.mkdir(item)
