Fix some packaging stuff

jgraham · jgraham · commit 218a97ecc7bc · 2010-01-18T00:00:02.000+01:00
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 simple custom format"""
 
 classifiers=[
-    'Development Status :: 5 - Stable',
+    'Development Status :: %(status)s',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Operating System :: OS Independent',
@@ -24,7 +24,7 @@
     ]
 
 setup(name='html5lib',
-      version='1.0',
+      version='%(version)s',
       url='http://code.google.com/p/html5lib/',
       license="MIT License",
       description='HTML parser based on the HTML5 specifcation',
@@ -36,7 +36,5 @@
           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'},
-      test_suite = "tests.buildTestSuite",
-      tests_require = ['simplejson']
+      package_dir = {'html5lib': os.path.join('src', 'html5lib')},
       )
diff --git a/src/html5lib/__init__.py b/src/html5lib/__init__.py
@@ -8,10 +8,9 @@
 
 import html5lib
 f = open("my_document.html")
-p = html5lib.HTMLParser()
-tree = p.parse(f) 
+tree = html5lib.parse(f) 
 """
-__version__ = "1.0"
+__version__ = "%(version)s"
 from html5parser import HTMLParser, parse, parseFragment
 from treebuilders import getTreeBuilder
 from treewalkers import getTreeWalker
diff --git a/utils/package.py b/utils/package.py
@@ -9,9 +9,8 @@
 
 exclude = [".svn", "*.pyc", "*~", "*.orig", "*.patch", "__basedir__/utils",
            "__basedir__/setup_base.py", "*.prof", "#*", "__basedir__/build",
-           '__basedir__/tests/performance', '*.out',
-           '__basedir__/tests/testdata/*.html',
-           '__basedir__/tests/testdata/sites', '__basedir__/print-stats.py']
+           '__basedir__/tests', '*.out', '__basedir__/dist', 
+           '__basedir__/html5lib.egg-info', '__basedir__/print-stats.py']
 
 class Package(object):
 
@@ -23,20 +22,19 @@ 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 = []
 
     def runall(self):
         self.copyTestData()
-        self.getFileList()
         self.copy()
+        self.makeInitFile()
         self.makeSetupFile()
         self.preprocess()
         #if self.test():
         self.makeZipFile()
-        #self.cleanup()
+        self.cleanup()
         
 
     def getExcludeList(self):
@@ -55,7 +53,7 @@ def copyTestData(self):
             if not os.path.exists(outDir):
                 raise
             
-        inBaseDir = os.path.abspath(os.path.join(self.inDir, "../testdata"))
+        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:])
@@ -111,12 +109,20 @@ def makeSetupFile(self):
                         "5":"5 - Production/Stable",
                         "6":"6 - Mature",
                         "7":"7 - Inactive"}
-        inFile = open(os.path.join(self.inDir, "setup_base.py"))
-        outFile = open(os.path.join(self.outDir, "setup.py"), "w")
+        inFile = open(os.path.join(self.outDir, "setup.py"))
         text = "".join(inFile.readlines())
+        inFile.close()
+        outFile = open(os.path.join(self.outDir, "setup.py"), "w")
         outFile.write(text%{"status":statusStrings[self.status],
                             "version":self.version})
-        
+
+    def makeInitFile(self):
+        inFile = open(os.path.join(self.outDir, "src", "html5lib", "__init__.py"))
+        text = "".join(inFile.readlines())
+        outFile = open(os.path.join(self.outDir, "src", "html5lib", "__init__.py"), 
+                       "w")
+        outFile.write(text%{"version":self.version})
+
     def copy(self):
         if not os.path.exists(self.outDir):
             os.mkdir(self.outDir)
