Skip to content

Commit 18db002

Browse files
author
dzsekijo
committed
Meta files face lift.
- Speak directly to package maintainers about compat issues - Miklos Szeredi deserves to be in AUTHORS - Also add Changelog and README.new_fusepy_api.html to source distro (ie. 'setup.py sdist' result)
1 parent 8b37312 commit 18db002

6 files changed

Lines changed: 180 additions & 4 deletions

File tree

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ Contributions
1010
=============
1111

1212
hello.py by Andrew Straw <strawman@astraw.com>
13+
threading related code cleaned up by Miklos Szeredi <miklos@szeredi.hu>

‎MANIFEST.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
recursive-include *.py *.c *.h *.tmpl
2+
include [A-Z]*

‎README.1st‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Some starting points:
22

3-
- (Newly written) documentation follows ResT_ syntax, and therefore
4-
can easily be rendered to various document formats.
3+
- (Newly written) documentation follows ResT_ syntax (including this one),
4+
thus can easily be rendered to various document formats.
55

66
- The API is described in ``README.new_fusepy_api``. It's an informative
77
description, not a reference. Apart from that, see the examples and
@@ -23,6 +23,14 @@ Some starting points:
2323
The bracketed hexa ids under changelog entries are the changeset
2424
ids according to Mercurial.
2525

26-
.. _ResT: http://docutils.sourceforge.nt
26+
- README.new_fusepy_api.html is only included in releases, generated by
27+
``rst2html`` of the `docutils` package, using a modified version of
28+
the ``voidspace`` template. That is, by
29+
30+
::
31+
32+
rst2html.py --stylesheet util/voidspace-fusepy.css README.new_fusepy_api
33+
34+
.. _ResT: http://docutils.sourceforge.net/rst.html
2735
.. _Mercurial: http://www.selenic.com/mercurial/
2836

‎README.package_maintainers‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
The API of the Python binding has changed with fuse-python 0.2-pre1.
2+
Therefore older fuse-python based filesystems *won't work* out of the box
3+
with fuse-python 0.2-pre1.
4+
5+
However, no need to worry. Just read the *Old API/Enforcing compatibility*
6+
section of ``README.new_fusepy_api`` and you will know how to deal with the
7+
situation.

‎setup.py‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66

77
try:
88
from setuptools import setup
9+
from setuptools.dist import Distribution
910
except ImportError:
1011
from distutils.core import setup
12+
from distutils.dist import Distribution
1113
from distutils.core import Extension
1214
import os
1315
import sys
@@ -24,6 +26,22 @@
2426
Topic :: System :: Filesystems
2527
"""
2628

29+
class MyDistribution(Distribution):
30+
"""
31+
Obnoxious hack to enforce the packager to generate
32+
the to-be-generated files
33+
"""
34+
35+
def run_command(self, command):
36+
if command == 'sdist':
37+
for f in ('Changelog', 'README.new_fusepy_api.html'):
38+
if not os.path.exists(f):
39+
raise RuntimeError, 'file ' + `f` + \
40+
" doesn't exist, please generate it before creating a source distribution"
41+
42+
return Distribution.run_command(self, command)
43+
44+
2745
# write default fuse.pc path into environment if PKG_CONFIG_PATH is unset
2846
#if not os.environ.has_key('PKG_CONFIG_PATH'):
2947
# os.environ['PKG_CONFIG_PATH'] = '/usr/local/lib/pkgconfig'
@@ -91,4 +109,5 @@ def setup(**kwargs):
91109
maintainer_email = 'csaba.henk@creo.hu',
92110
ext_modules = [fusemodule],
93111
packages = ["fuseparts"],
94-
py_modules=["fuse"])
112+
py_modules=["fuse"],
113+
distclass = MyDistribution)

‎util/voidspace-fusepy.css‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
/*
2+
:Authors: Ian Bicking, Michael Foord
3+
:Contact: fuzzyman@voidspace.org.uk
4+
:Date: 2005/08/26
5+
:Version: 0.1.0
6+
:Copyright: This stylesheet has been placed in the public domain.
7+
8+
Stylesheet for Docutils.
9+
Based on ``blue_box.css`` by Ian Bicking
10+
and ``html4css1.css`` revision 1.46.
11+
*/
12+
13+
@import url(html4css1.css);
14+
15+
body {
16+
font-family: Arial, sans-serif;
17+
background-color: lightblue;
18+
}
19+
20+
em, i {
21+
/* Typically serif fonts have much nicer italics */
22+
font-family: Times New Roman, Times, serif;
23+
}
24+
25+
a.target {
26+
color: blue;
27+
}
28+
29+
a.target {
30+
color: blue;
31+
}
32+
33+
a.toc-backref {
34+
text-decoration: none;
35+
color: black;
36+
}
37+
38+
a.toc-backref:hover {
39+
background-color: inherit;
40+
}
41+
42+
a:hover {
43+
background-color: #cccccc;
44+
}
45+
46+
div.attention, div.caution, div.danger, div.error, div.hint,
47+
div.important, div.note, div.tip, div.warning {
48+
background-color: #cccccc;
49+
padding: 3px;
50+
width: 80%;
51+
}
52+
53+
div.admonition p.admonition-title, div.hint p.admonition-title,
54+
div.important p.admonition-title, div.note p.admonition-title,
55+
div.tip p.admonition-title {
56+
text-align: center;
57+
background-color: #999999;
58+
display: block;
59+
margin: 0;
60+
}
61+
62+
div.attention p.admonition-title, div.caution p.admonition-title,
63+
div.danger p.admonition-title, div.error p.admonition-title,
64+
div.warning p.admonition-title {
65+
color: #cc0000;
66+
font-family: sans-serif;
67+
text-align: center;
68+
background-color: #999999;
69+
display: block;
70+
margin: 0;
71+
}
72+
73+
h1, h2, h3, h4, h5, h6 {
74+
font-family: Helvetica, Arial, sans-serif;
75+
border: thin solid black;
76+
/* This makes the borders rounded on Mozilla, which pleases me */
77+
-moz-border-radius: 8px;
78+
padding: 4px;
79+
}
80+
81+
h1 {
82+
background-color: #444499;
83+
color: #ffffff;
84+
border: medium solid black;
85+
}
86+
87+
h1 a.toc-backref, h2 a.toc-backref {
88+
color: #ffffff;
89+
}
90+
91+
h2 {
92+
background-color: #666666;
93+
color: #ffffff;
94+
border: medium solid black;
95+
}
96+
97+
h3, h4, h5, h6 {
98+
background-color: #cccccc;
99+
color: #000000;
100+
}
101+
102+
h3 a.toc-backref, h4 a.toc-backref, h5 a.toc-backref,
103+
h6 a.toc-backref {
104+
color: #000000;
105+
}
106+
107+
h1.title {
108+
text-align: center;
109+
background-color: pink;
110+
color: #eeeeee;
111+
border: thick solid black;
112+
-moz-border-radius: 20px;
113+
}
114+
115+
table.footnote {
116+
padding-left: 0.5ex;
117+
}
118+
119+
table.citation {
120+
padding-left: 0.5ex
121+
}
122+
123+
pre.literal-block, pre.doctest-block {
124+
border: thin black solid;
125+
padding: 5px;
126+
}
127+
128+
.image img { border-style : solid;
129+
border-width : 2px;
130+
}
131+
132+
h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
133+
font-size: 100%;
134+
}
135+
136+
code, tt {
137+
color: #000066;
138+
}
139+

0 commit comments

Comments
 (0)