Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit218a97e

Browse files
committed
Fix some packaging stuff
1 parent33cb109 commit218a97e

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

‎setup.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
simple custom format"""
1515

1616
classifiers=[
17-
'Development Status ::5 - Stable',
17+
'Development Status ::%(status)s',
1818
'Intended Audience :: Developers',
1919
'License :: OSI Approved :: MIT License',
2020
'Operating System :: OS Independent',
@@ -24,7 +24,7 @@
2424
]
2525

2626
setup(name='html5lib',
27-
version='1.0',
27+
version='%(version)s',
2828
url='http://code.google.com/p/html5lib/',
2929
license="MIT License",
3030
description='HTML parser based on the HTML5 specifcation',
@@ -36,7 +36,5 @@
3636
fornameinos.listdir(os.path.join('src','html5lib'))
3737
ifos.path.isdir(os.path.join('src','html5lib',name))and
3838
notname.startswith('.')],
39-
package_dir= {'html5lib':'src/html5lib'},
40-
test_suite="tests.buildTestSuite",
41-
tests_require= ['simplejson']
39+
package_dir= {'html5lib':os.path.join('src','html5lib')},
4240
)

‎src/html5lib/__init__.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
99
import html5lib
1010
f = open("my_document.html")
11-
p = html5lib.HTMLParser()
12-
tree = p.parse(f)
11+
tree = html5lib.parse(f)
1312
"""
14-
__version__="1.0"
13+
__version__="%(version)s"
1514
fromhtml5parserimportHTMLParser,parse,parseFragment
1615
fromtreebuildersimportgetTreeBuilder
1716
fromtreewalkersimportgetTreeWalker

‎utils/package.py‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99

1010
exclude= [".svn","*.pyc","*~","*.orig","*.patch","__basedir__/utils",
1111
"__basedir__/setup_base.py","*.prof","#*","__basedir__/build",
12-
'__basedir__/tests/performance','*.out',
13-
'__basedir__/tests/testdata/*.html',
14-
'__basedir__/tests/testdata/sites','__basedir__/print-stats.py']
12+
'__basedir__/tests','*.out','__basedir__/dist',
13+
'__basedir__/html5lib.egg-info','__basedir__/print-stats.py']
1514

1615
classPackage(object):
1716

@@ -23,20 +22,19 @@ def __init__(self, inDir, outDir, version="0", status=4, installDir="~"):
2322
self.inDir=os.path.abspath(inDir)
2423
self.outDir=os.path.abspath(outDir)
2524
self.exclude=self.getExcludeList()
26-
printself.exclude
2725
self.fileList=self.getFileList()
2826
self.installDir=installDir
2927
self.outFiles= []
3028

3129
defrunall(self):
3230
self.copyTestData()
33-
self.getFileList()
3431
self.copy()
32+
self.makeInitFile()
3533
self.makeSetupFile()
3634
self.preprocess()
3735
#if self.test():
3836
self.makeZipFile()
39-
#self.cleanup()
37+
self.cleanup()
4038

4139

4240
defgetExcludeList(self):
@@ -55,7 +53,7 @@ def copyTestData(self):
5553
ifnotos.path.exists(outDir):
5654
raise
5755

58-
inBaseDir=os.path.abspath(os.path.join(self.inDir,"../testdata"))
56+
inBaseDir=os.path.abspath(os.path.join(self.inDir,"..","testdata"))
5957
dirWalker=os.walk(inBaseDir)
6058
for (curDir,dirs,files)indirWalker:
6159
outDir=os.path.join(self.inDir,"tests","testdata",curDir[len(inBaseDir)+1:])
@@ -111,12 +109,20 @@ def makeSetupFile(self):
111109
"5":"5 - Production/Stable",
112110
"6":"6 - Mature",
113111
"7":"7 - Inactive"}
114-
inFile=open(os.path.join(self.inDir,"setup_base.py"))
115-
outFile=open(os.path.join(self.outDir,"setup.py"),"w")
112+
inFile=open(os.path.join(self.outDir,"setup.py"))
116113
text="".join(inFile.readlines())
114+
inFile.close()
115+
outFile=open(os.path.join(self.outDir,"setup.py"),"w")
117116
outFile.write(text%{"status":statusStrings[self.status],
118117
"version":self.version})
119-
118+
119+
defmakeInitFile(self):
120+
inFile=open(os.path.join(self.outDir,"src","html5lib","__init__.py"))
121+
text="".join(inFile.readlines())
122+
outFile=open(os.path.join(self.outDir,"src","html5lib","__init__.py"),
123+
"w")
124+
outFile.write(text%{"version":self.version})
125+
120126
defcopy(self):
121127
ifnotos.path.exists(self.outDir):
122128
os.mkdir(self.outDir)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp