From 101671ae44e1686680c80cd07b452aabeb88fb63 Mon Sep 17 00:00:00 2001 From: goodger Date: Sat, 20 Apr 2002 03:01:52 +0000 Subject: Initial revision git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@18 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 setup.py (limited to 'setup.py') diff --git a/setup.py b/setup.py new file mode 100755 index 000000000..23aa0ce4a --- /dev/null +++ b/setup.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +# $Id$ + +from distutils.core import setup + +def do_setup(): + dist = setup( + name = 'Docutils', + description = 'Python Documentation Utilities', + #long_description = '', + url = 'http://docutils.sourceforge.net/', + version = 'pre-0.1', + author = 'David Goodger', + author_email = 'goodger@users.sourceforge.net', + license = 'public domain, Python (see COPYING.txt)', + packages = ['docutils', 'docutils.readers', 'docutils.writers', + 'docutils.transforms', 'docutils.languages', + 'docutils.parsers', 'docutils.parsers.restructuredtext', + 'docutils.parsers.restructuredtext.directives', + 'docutils.parsers.restructuredtext.languages']) + return dist + +if __name__ == '__main__' : + do_setup() -- cgit v1.2.1 From 79a83912018e5beebe8d43b3432ae72e2b32d8b2 Mon Sep 17 00:00:00 2001 From: goodger Date: Sat, 20 Apr 2002 03:50:24 +0000 Subject: fixed name git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@26 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 23aa0ce4a..d19d42c6e 100755 --- a/setup.py +++ b/setup.py @@ -15,9 +15,9 @@ def do_setup(): license = 'public domain, Python (see COPYING.txt)', packages = ['docutils', 'docutils.readers', 'docutils.writers', 'docutils.transforms', 'docutils.languages', - 'docutils.parsers', 'docutils.parsers.restructuredtext', - 'docutils.parsers.restructuredtext.directives', - 'docutils.parsers.restructuredtext.languages']) + 'docutils.parsers', 'docutils.parsers.rst', + 'docutils.parsers.rst.directives', + 'docutils.parsers.rst.languages']) return dist if __name__ == '__main__' : -- cgit v1.2.1 From 19f36f6deb6962feb5b798e2824abf6a835c9dcb Mon Sep 17 00:00:00 2001 From: goodger Date: Sat, 20 Apr 2002 16:38:05 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@30 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d19d42c6e..ca4fb45f2 100755 --- a/setup.py +++ b/setup.py @@ -5,11 +5,11 @@ from distutils.core import setup def do_setup(): dist = setup( - name = 'Docutils', + name = 'docutils', description = 'Python Documentation Utilities', #long_description = '', url = 'http://docutils.sourceforge.net/', - version = 'pre-0.1', + version = '0.1', author = 'David Goodger', author_email = 'goodger@users.sourceforge.net', license = 'public domain, Python (see COPYING.txt)', -- cgit v1.2.1 From 682398e24b9262bb39c4e3aaefe6903f1031e51c Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 13 Jun 2002 03:35:39 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@185 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ca4fb45f2..ef42fdfd2 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ def do_setup(): description = 'Python Documentation Utilities', #long_description = '', url = 'http://docutils.sourceforge.net/', - version = '0.1', + version = '0.1+', author = 'David Goodger', author_email = 'goodger@users.sourceforge.net', license = 'public domain, Python (see COPYING.txt)', -- cgit v1.2.1 From 1822e231995b5aacc2511922f1fe4b7c46ff2de5 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 1 Aug 2002 00:15:21 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@433 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ef42fdfd2..06393c568 100755 --- a/setup.py +++ b/setup.py @@ -9,10 +9,10 @@ def do_setup(): description = 'Python Documentation Utilities', #long_description = '', url = 'http://docutils.sourceforge.net/', - version = '0.1+', + version = '0.2', author = 'David Goodger', author_email = 'goodger@users.sourceforge.net', - license = 'public domain, Python (see COPYING.txt)', + license = 'public domain, Python, BSD (see COPYING.txt)', packages = ['docutils', 'docutils.readers', 'docutils.writers', 'docutils.transforms', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', -- cgit v1.2.1 From 415ea7d3b8d5217275984c80b475d4cf2da5b00d Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 2 Aug 2002 03:34:18 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@441 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 06393c568..636619bb6 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ def do_setup(): description = 'Python Documentation Utilities', #long_description = '', url = 'http://docutils.sourceforge.net/', - version = '0.2', + version = '0.2+', author = 'David Goodger', author_email = 'goodger@users.sourceforge.net', license = 'public domain, Python, BSD (see COPYING.txt)', -- cgit v1.2.1 From 35a1beda765cd44715a9ea7c4064d71b1abbcf1e Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 24 Oct 2002 23:33:52 +0000 Subject: minor updates & fixes git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@859 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 636619bb6..c58ab1725 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,8 @@ def do_setup(): 'docutils.transforms', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', 'docutils.parsers.rst.directives', - 'docutils.parsers.rst.languages']) + 'docutils.parsers.rst.languages'], + scripts = ['tools/html.py'] ) return dist if __name__ == '__main__' : -- cgit v1.2.1 From 1e65626e89a45d8790785c66aede0800c3f85804 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 24 Oct 2002 23:42:49 +0000 Subject: undo; oops git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@860 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c58ab1725..636619bb6 100755 --- a/setup.py +++ b/setup.py @@ -17,8 +17,7 @@ def do_setup(): 'docutils.transforms', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', 'docutils.parsers.rst.directives', - 'docutils.parsers.rst.languages'], - scripts = ['tools/html.py'] ) + 'docutils.parsers.rst.languages']) return dist if __name__ == '__main__' : -- cgit v1.2.1 From 81aad40b040b12131be620440a36ffb1cfa3e9b7 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 12 Dec 2002 02:45:53 +0000 Subject: Added readers/python subpackage git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1014 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 636619bb6..a6c641672 100755 --- a/setup.py +++ b/setup.py @@ -13,11 +13,13 @@ def do_setup(): author = 'David Goodger', author_email = 'goodger@users.sourceforge.net', license = 'public domain, Python, BSD (see COPYING.txt)', - packages = ['docutils', 'docutils.readers', 'docutils.writers', - 'docutils.transforms', 'docutils.languages', + packages = ['docutils', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', 'docutils.parsers.rst.directives', - 'docutils.parsers.rst.languages']) + 'docutils.parsers.rst.languages', + 'docutils.readers', 'docutils.readers.python', + 'docutils.transforms', + 'docutils.writers',]) return dist if __name__ == '__main__' : -- cgit v1.2.1 From 4cc798623cc64d7cd12d72105edb830ac7af07e6 Mon Sep 17 00:00:00 2001 From: goodger Date: Mon, 9 Jun 2003 21:26:31 +0000 Subject: clarification of public domain status git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1409 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a6c641672..3349bf8d0 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python # $Id$ +# Copyright: This file has been placed in the public domain. from distutils.core import setup -- cgit v1.2.1 From d70149cd0a3b44763f7077211379d2b7f68280cd Mon Sep 17 00:00:00 2001 From: goodger Date: Mon, 16 Jun 2003 03:13:23 +0000 Subject: Updated with PyPI Trove classifiers. Conditional installation of third-party modules. Is there a better way? git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1463 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 16 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3349bf8d0..46c517d0d 100755 --- a/setup.py +++ b/setup.py @@ -2,26 +2,91 @@ # $Id$ # Copyright: This file has been placed in the public domain. +import sys from distutils.core import setup def do_setup(): - dist = setup( - name = 'docutils', - description = 'Python Documentation Utilities', - #long_description = '', - url = 'http://docutils.sourceforge.net/', - version = '0.2+', - author = 'David Goodger', - author_email = 'goodger@users.sourceforge.net', - license = 'public domain, Python, BSD (see COPYING.txt)', - packages = ['docutils', 'docutils.languages', - 'docutils.parsers', 'docutils.parsers.rst', - 'docutils.parsers.rst.directives', - 'docutils.parsers.rst.languages', - 'docutils.readers', 'docutils.readers.python', - 'docutils.transforms', - 'docutils.writers',]) + extras = get_extras() + if extras: + setup(py_modules = extras, + package_dir = {'': 'extras'}) + kwargs = package_data.copy() + if sys.hexversion >= 0x02030000: # Python 2.3 + kwargs['classifiers'] = classifiers + dist = setup(**kwargs) + #import pprint + #pprint.pprint(dist.__dict__) return dist +package_data = { + 'name': 'docutils', + 'description': 'Python Documentation Utilities', + 'long_description': """\ +Docutils is a modular system for processing documentation into useful formats, +such as HTML, XML, and TeX. For input Docutils supports reStructuredText, an +easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", + 'url': 'http://docutils.sourceforge.net/', + 'version': '0.2+', + 'author': 'David Goodger', + 'author_email': 'goodger@users.sourceforge.net', + 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', + 'packages': ['docutils', 'docutils.languages', + 'docutils.parsers', 'docutils.parsers.rst', + 'docutils.parsers.rst.directives', + 'docutils.parsers.rst.languages', + 'docutils.readers', 'docutils.readers.python', + 'docutils.transforms', + 'docutils.writers',],} +"""Distutils setup parameters.""" + +classifiers = [ + 'Development Status :: 3 - Alpha', + 'Environment :: Console', + 'Intended Audience :: End Users/Desktop', + 'Intended Audience :: Other Audience', + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', + 'License :: Public Domain', + 'License :: OSI Approved :: Python Software Foundation License', + 'License :: OSI Approved :: BSD License', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Documentation', + 'Topic :: Software Development :: Documentation', + 'Topic :: Text Processing', + 'Natural Language :: English', + 'Natural Language :: French', + 'Natural Language :: German', + 'Natural Language :: Italian', + 'Natural Language :: Slovak', + 'Natural Language :: Spanish', + 'Natural Language :: Swedish',] +"""Trove classifiers for the Distutils "register" command; +Python 2.3 and up.""" + +extra_modules = [('optparse', '1.4.1', None), + ('textwrap', None, None), + ('roman', '1.4', ['toRoman', 'fromRoman', + 'InvalidRomanNumeralError'])] +"""Third-party modules to install if they're not already present. +List of (module name, minimum __version__ string, [attribute names]).""" + +def get_extras(): + extras = [] + for module_name, version, attributes in extra_modules: + try: + module = __import__(module_name) + if version and module.__version__ < version: + raise ValueError + for attribute in attributes or []: + getattr(module, attribute) + print ('"%s" module already present; ignoring extras/%s.py.' + % (module_name, module_name)) + except (ImportError, AttributeError, ValueError): + extras.append(module_name) + return extras + + if __name__ == '__main__' : do_setup() -- cgit v1.2.1 From 23813a991d58c938fb5eaaf9dc4367f77208f2fe Mon Sep 17 00:00:00 2001 From: goodger Date: Mon, 16 Jun 2003 04:16:28 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1472 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 46c517d0d..7284a6c84 100755 --- a/setup.py +++ b/setup.py @@ -19,17 +19,19 @@ def do_setup(): return dist package_data = { - 'name': 'docutils', + 'name': 'Docutils', 'description': 'Python Documentation Utilities', 'long_description': """\ -Docutils is a modular system for processing documentation into useful formats, -such as HTML, XML, and TeX. For input Docutils supports reStructuredText, an -easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", +Docutils is a modular system for processing documentation +into useful formats, such as HTML, XML, and TeX. For input +Docutils supports reStructuredText, an easy-to-read, +what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', 'version': '0.2+', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', + 'platforms': 'OS-independent', 'packages': ['docutils', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', 'docutils.parsers.rst.directives', -- cgit v1.2.1 From 4933ceb45f1b0c1d621ce8ba6f8d82e32578a23f Mon Sep 17 00:00:00 2001 From: goodger Date: Mon, 16 Jun 2003 18:09:36 +0000 Subject: tweaks git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1481 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7284a6c84..93e869b1c 100755 --- a/setup.py +++ b/setup.py @@ -8,19 +8,18 @@ from distutils.core import setup def do_setup(): extras = get_extras() if extras: - setup(py_modules = extras, + setup(name = 'Extras--IGNORE', # name for tarball + py_modules = extras, package_dir = {'': 'extras'}) kwargs = package_data.copy() if sys.hexversion >= 0x02030000: # Python 2.3 kwargs['classifiers'] = classifiers dist = setup(**kwargs) - #import pprint - #pprint.pprint(dist.__dict__) return dist package_data = { - 'name': 'Docutils', - 'description': 'Python Documentation Utilities', + 'name': 'docutils', + 'description': 'Docutils -- Python Documentation Utilities', 'long_description': """\ Docutils is a modular system for processing documentation into useful formats, such as HTML, XML, and TeX. For input -- cgit v1.2.1 From 40c179bfbe7502b2e996e72d6e7a735eb4587e9b Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 22 Jun 2003 23:07:32 +0000 Subject: Thomas Heller showed us a better way git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1496 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 93e869b1c..b45d649aa 100755 --- a/setup.py +++ b/setup.py @@ -3,15 +3,17 @@ # Copyright: This file has been placed in the public domain. import sys +import os from distutils.core import setup +from distutils.command.build_py import build_py + def do_setup(): + kwargs = package_data.copy() extras = get_extras() if extras: - setup(name = 'Extras--IGNORE', # name for tarball - py_modules = extras, - package_dir = {'': 'extras'}) - kwargs = package_data.copy() + kwargs['py_modules'] = extras + kwargs['cmdclass'] = {'build_py': dual_build_py} if sys.hexversion >= 0x02030000: # Python 2.3 kwargs['classifiers'] = classifiers dist = setup(**kwargs) @@ -31,6 +33,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', 'platforms': 'OS-independent', + 'package_dir': {'docutils': 'docutils', '': 'extras'}, 'packages': ['docutils', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', 'docutils.parsers.rst.directives', @@ -89,5 +92,22 @@ def get_extras(): return extras +class dual_build_py(build_py): + + """ + This class allows the distribution of both packages *and* modules with one + call to `distutils.core.setup()`. Thanks to Thomas Heller. + """ + + def run(self): + if not self.py_modules and not self.packages: + return + if self.py_modules: + self.build_modules() + if self.packages: + self.build_packages() + self.byte_compile(self.get_outputs(include_bytecode=0)) + + if __name__ == '__main__' : do_setup() -- cgit v1.2.1 From b48b803fa2457708113c059d539e9053abdaeb3f Mon Sep 17 00:00:00 2001 From: goodger Date: Wed, 25 Jun 2003 01:47:04 +0000 Subject: ready for release 0.3 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1504 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b45d649aa..425f6a5e7 100755 --- a/setup.py +++ b/setup.py @@ -13,9 +13,10 @@ def do_setup(): extras = get_extras() if extras: kwargs['py_modules'] = extras - kwargs['cmdclass'] = {'build_py': dual_build_py} if sys.hexversion >= 0x02030000: # Python 2.3 kwargs['classifiers'] = classifiers + else: + kwargs['cmdclass'] = {'build_py': dual_build_py} dist = setup(**kwargs) return dist @@ -28,7 +29,7 @@ into useful formats, such as HTML, XML, and TeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.2+', + 'version': '0.3', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', @@ -96,7 +97,8 @@ class dual_build_py(build_py): """ This class allows the distribution of both packages *and* modules with one - call to `distutils.core.setup()`. Thanks to Thomas Heller. + call to `distutils.core.setup()` (necessary for pre-2.3 Python). Thanks + to Thomas Heller. """ def run(self): -- cgit v1.2.1 From 03c881b3cfe692152a0c7bbf97b61d72e69c6768 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 26 Jun 2003 18:36:50 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1512 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 425f6a5e7..2bcda7439 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and TeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3', + 'version': '0.3+', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 7fe9a105ff808403c211faff5eb3adfe7854e78c Mon Sep 17 00:00:00 2001 From: rnd0110 Date: Mon, 30 Jun 2003 04:51:52 +0000 Subject: Afrikaans and Russian natural languages added. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1530 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2bcda7439..ec76d6e30 100755 --- a/setup.py +++ b/setup.py @@ -60,10 +60,12 @@ classifiers = [ 'Topic :: Documentation', 'Topic :: Software Development :: Documentation', 'Topic :: Text Processing', + 'Natural Language :: Afrikaans', 'Natural Language :: English', 'Natural Language :: French', 'Natural Language :: German', 'Natural Language :: Italian', + 'Natural Language :: Russian', 'Natural Language :: Slovak', 'Natural Language :: Spanish', 'Natural Language :: Swedish',] -- cgit v1.2.1 From 28857dcf7dc161448017cfa6b6d1f22e270cf177 Mon Sep 17 00:00:00 2001 From: goodger Date: Tue, 1 Jul 2003 13:25:35 +0000 Subject: keep English first git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1544 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ec76d6e30..34c8680de 100755 --- a/setup.py +++ b/setup.py @@ -60,8 +60,8 @@ classifiers = [ 'Topic :: Documentation', 'Topic :: Software Development :: Documentation', 'Topic :: Text Processing', + 'Natural Language :: English', # main/default language, keep first 'Natural Language :: Afrikaans', - 'Natural Language :: English', 'Natural Language :: French', 'Natural Language :: German', 'Natural Language :: Italian', -- cgit v1.2.1 From 67347e6ad5e943c39d095c63ec00fd170fa6b749 Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 11 Jul 2003 02:11:37 +0000 Subject: updated git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1586 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 34c8680de..e790c69f2 100755 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ classifiers = [ 'Topic :: Text Processing', 'Natural Language :: English', # main/default language, keep first 'Natural Language :: Afrikaans', + 'Natural Language :: Esperanto', 'Natural Language :: French', 'Natural Language :: German', 'Natural Language :: Italian', -- cgit v1.2.1 From 2d729c2efcbfe2b7f565bba45c02ea69a36b8c97 Mon Sep 17 00:00:00 2001 From: bbum Date: Wed, 3 Dec 2003 18:45:07 +0000 Subject: rst2html.py added and installed by setup.py git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@1756 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e790c69f2..8b0394a56 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,8 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.parsers.rst.languages', 'docutils.readers', 'docutils.readers.python', 'docutils.transforms', - 'docutils.writers',],} + 'docutils.writers',], + 'scripts' : ['tools/rst2html.py',],} """Distutils setup parameters.""" classifiers = [ -- cgit v1.2.1 From 49b692d40b9c52b59cacdb6f5822c7297a7655a2 Mon Sep 17 00:00:00 2001 From: wiemann Date: Sun, 9 May 2004 16:22:22 +0000 Subject: bumped version to 0.3.3 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2066 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8b0394a56..7ba893a0b 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and TeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3+', + 'version': '0.3.3', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From e238e6994fad68de6a591ccbb947d57f61dc4c95 Mon Sep 17 00:00:00 2001 From: wiemann Date: Sun, 9 May 2004 17:19:52 +0000 Subject: set version to 0.3.3+ git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2071 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7ba893a0b..32fb56242 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and TeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.3', + 'version': '0.3.3+', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 8b9e951b3748fce0b6d3ac74db9e036ec96b3a6b Mon Sep 17 00:00:00 2001 From: wiemann Date: Tue, 27 Jul 2004 15:29:11 +0000 Subject: added rst2latex.py git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2465 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 32fb56242..0f81085f4 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.readers', 'docutils.readers.python', 'docutils.transforms', 'docutils.writers',], - 'scripts' : ['tools/rst2html.py',],} + 'scripts' : ['tools/rst2html.py','tools/rst2latex.py'],} """Distutils setup parameters.""" classifiers = [ -- cgit v1.2.1 From 72fbe1d43509e73aca210dbcf57d58076cc2999a Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 29 Jul 2004 13:57:48 +0000 Subject: TeX -> LaTeX git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2508 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0f81085f4..c1dbd64a3 100755 --- a/setup.py +++ b/setup.py @@ -25,8 +25,8 @@ package_data = { 'description': 'Docutils -- Python Documentation Utilities', 'long_description': """\ Docutils is a modular system for processing documentation -into useful formats, such as HTML, XML, and TeX. For input -Docutils supports reStructuredText, an easy-to-read, +into useful formats, such as HTML, XML, and LaTeX. For +input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', 'version': '0.3.3+', -- cgit v1.2.1 From d55cec685e1514c070b2eb77bc6015dfebbedc1f Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 29 Jul 2004 14:57:28 +0000 Subject: release 0.3.5 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2512 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c1dbd64a3..3740bef99 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.3+', + 'version': '0.3.5', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 24c3144d3600279ca16a90df8448436637b17048 Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 29 Jul 2004 18:18:35 +0000 Subject: release 0.3.5 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2518 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3740bef99..66c90c3d7 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.5', + 'version': '0.3.6', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From f6253be6f54c20dbb4a65fa7c03d27c510299ebb Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 23 Dec 2004 16:34:24 +0000 Subject: added text about using the unicode directive for en and em dashes git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2888 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 66c90c3d7..9f5280717 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.6', + 'version': '0.3.7', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 58f039b55de17ed6b25baa7902b7ea1dcbb7b598 Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 23 Dec 2004 16:40:35 +0000 Subject: reverted accidentally committed files; sorry git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2889 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9f5280717..66c90c3d7 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.7', + 'version': '0.3.6', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 16285d9ba32a086ce2f12c1af08b844cba7339ca Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 23 Dec 2004 23:04:11 +0000 Subject: Release 0.4.0: set version number to 0.4.0 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2894 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 66c90c3d7..2f87954ec 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.6', + 'version': '0.4.0', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 740682332c3a17b86db19fa219a99e44e74e24af Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 23 Dec 2004 23:39:15 +0000 Subject: Release 0.3.7: set version number to 0.3.7 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2897 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2f87954ec..9f5280717 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.4.0', + 'version': '0.3.7', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 74ef0ca97d6a845eb24a2fa0546612d34474d043 Mon Sep 17 00:00:00 2001 From: wiemann Date: Fri, 24 Dec 2004 00:55:16 +0000 Subject: Release 0.3.7: set version number to 0.3.8 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2901 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9f5280717..218650b30 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.7', + 'version': '0.3.8', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From e78956c8fc478dc7ef264531983024e8269130ea Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 26 May 2005 21:21:48 +0000 Subject: Release 0.3.9: set version number to 0.3.9 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3374 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 218650b30..6fc4879b3 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.8', + 'version': '0.3.9', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 63fff375aa144a601b0e9588f1868f1b15c21703 Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 26 May 2005 22:52:48 +0000 Subject: Release 0.3.9: set version number to 0.3.10 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3379 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6fc4879b3..cb737ef7d 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.9', + 'version': '0.3.10', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 3b7a7200860068db23463a6a4246c19814012ee9 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 12 Jun 2005 16:40:14 +0000 Subject: Added standard data file syntax to the "include" directive. Added docutils/parsers/rst/include/ directory; contains the standard data files, with character entity substitution definition sets as initial contents. Added docs/ref/rst/substitutions.txt: "reStructuredText Standard Substitution Definition Sets". Updated docs, tests, & setup.py. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3472 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index cb737ef7d..6666de678 100755 --- a/setup.py +++ b/setup.py @@ -4,8 +4,22 @@ import sys import os +import glob from distutils.core import setup from distutils.command.build_py import build_py +from distutils.command.install_data import install_data + + +class smart_install_data(install_data): + + # From , + # by Pete Shinners. + + def run(self): + #need to change self.install_dir to the library dir + install_cmd = self.get_finalized_command('install') + self.install_dir = getattr(install_cmd, 'install_lib') + return install_data.run(self) def do_setup(): @@ -34,6 +48,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', 'platforms': 'OS-independent', + 'cmdclass': {'install_data': smart_install_data}, 'package_dir': {'docutils': 'docutils', '': 'extras'}, 'packages': ['docutils', 'docutils.languages', 'docutils.parsers', 'docutils.parsers.rst', @@ -42,6 +57,8 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.readers', 'docutils.readers.python', 'docutils.transforms', 'docutils.writers',], + 'data_files': [('docutils/parsers/rst/data', + glob.glob('docutils/parsers/rst/data/*.txt'))], 'scripts' : ['tools/rst2html.py','tools/rst2latex.py'],} """Distutils setup parameters.""" -- cgit v1.2.1 From bfc2500aadc16552de95fbab6ea663bf6f85c2bd Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 24 Jun 2005 19:46:00 +0000 Subject: correction git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3575 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6666de678..49b399f9e 100755 --- a/setup.py +++ b/setup.py @@ -57,8 +57,8 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.readers', 'docutils.readers.python', 'docutils.transforms', 'docutils.writers',], - 'data_files': [('docutils/parsers/rst/data', - glob.glob('docutils/parsers/rst/data/*.txt'))], + 'data_files': [('docutils/parsers/rst/include', + glob.glob('docutils/parsers/rst/include/*.txt'))], 'scripts' : ['tools/rst2html.py','tools/rst2latex.py'],} """Distutils setup parameters.""" -- cgit v1.2.1 From 1b0c89fafde2292c03a0a21822ba083dca903bb1 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 25 Sep 2005 15:49:54 +0000 Subject: added docutils/writers/support/ directory and removed tools/stylesheets/; updated defaults; removed docutils/transforms/html.py (no longer needed); removed ``_stylesheet_required`` internal setting; updated setup.py git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3901 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 49b399f9e..24caa593c 100755 --- a/setup.py +++ b/setup.py @@ -50,16 +50,33 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'platforms': 'OS-independent', 'cmdclass': {'install_data': smart_install_data}, 'package_dir': {'docutils': 'docutils', '': 'extras'}, - 'packages': ['docutils', 'docutils.languages', - 'docutils.parsers', 'docutils.parsers.rst', + 'packages': ['docutils', + 'docutils.languages', + 'docutils.parsers', + 'docutils.parsers.rst', 'docutils.parsers.rst.directives', 'docutils.parsers.rst.languages', - 'docutils.readers', 'docutils.readers.python', + 'docutils.readers', + 'docutils.readers.python', 'docutils.transforms', - 'docutils.writers',], + 'docutils.writers', + 'docutils.writers.support', + 'docutils.writers.support.newlatex2e'], 'data_files': [('docutils/parsers/rst/include', - glob.glob('docutils/parsers/rst/include/*.txt'))], - 'scripts' : ['tools/rst2html.py','tools/rst2latex.py'],} + glob.glob('docutils/parsers/rst/include/*.txt')), + ('docutils/writers/support', + ['docutils/writers/support/html4css1.css', + 'docutils/writers/support/latex2e.tex']), + ('docutils/writers/support/newlatex2e', + ['docutils/writers/support/newlatex2e/base.tex']), + ('docutils/writers/support/pep_html', + ['docutils/writers/support/pep_html/pep.css', + 'docutils/writers/support/pep_html/template.txt']),], + 'scripts' : ['tools/rst2html.py', + 'tools/rst2latex.py', + 'tools/rst2newlatex.py', + 'tools/rst2xml.py', + 'tools/rst2pseudoxml.py'],} """Distutils setup parameters.""" classifiers = [ -- cgit v1.2.1 From 118dd3d2aa36cf563590197e28830c1a905f9cd8 Mon Sep 17 00:00:00 2001 From: goodger Date: Thu, 8 Dec 2005 04:43:13 +0000 Subject: merged branches/s5 changes r4011:4155 into trunk/docutils git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4156 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 24caa593c..157158c4f 100755 --- a/setup.py +++ b/setup.py @@ -71,8 +71,12 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 ['docutils/writers/support/newlatex2e/base.tex']), ('docutils/writers/support/pep_html', ['docutils/writers/support/pep_html/pep.css', - 'docutils/writers/support/pep_html/template.txt']),], + 'docutils/writers/support/pep_html/template.txt']), + ('docutils/writers/support/s5_html', + (['docutils/writers/support/s5_html/README.txt'] + + glob.glob('docutils/writers/support/s5_html/*/*')))], 'scripts' : ['tools/rst2html.py', + 'tools/rst2s5.py', 'tools/rst2latex.py', 'tools/rst2newlatex.py', 'tools/rst2xml.py', -- cgit v1.2.1 From c2737d5c145b4715cf6ed0b4fd9362e07d50b86b Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 9 Dec 2005 04:21:34 +0000 Subject: Converted ``docutils/writers/support/`` into individual writer packages; updated docs & refs. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4163 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 157158c4f..c00ced9d4 100755 --- a/setup.py +++ b/setup.py @@ -60,21 +60,25 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.readers.python', 'docutils.transforms', 'docutils.writers', - 'docutils.writers.support', - 'docutils.writers.support.newlatex2e'], + 'docutils.writers.html4css1', + 'docutils.writers.pep_html', + 'docutils.writers.s5_html', + 'docutils.writers.latex2e', + 'docutils.writers.newlatex2e'], 'data_files': [('docutils/parsers/rst/include', glob.glob('docutils/parsers/rst/include/*.txt')), - ('docutils/writers/support', - ['docutils/writers/support/html4css1.css', - 'docutils/writers/support/latex2e.tex']), - ('docutils/writers/support/newlatex2e', - ['docutils/writers/support/newlatex2e/base.tex']), - ('docutils/writers/support/pep_html', - ['docutils/writers/support/pep_html/pep.css', - 'docutils/writers/support/pep_html/template.txt']), - ('docutils/writers/support/s5_html', - (['docutils/writers/support/s5_html/README.txt'] - + glob.glob('docutils/writers/support/s5_html/*/*')))], + ('docutils/writers/html4css1', + ['docutils/writers/html4css1/html4css1.css']), + ('docutils/writers/latex2e', + 'docutils/writers/latex2e/latex2e.tex']), + ('docutils/writers/newlatex2e', + ['docutils/writers/newlatex2e/base.tex']), + ('docutils/writers/pep_html', + ['docutils/writers/pep_html/pep.css', + 'docutils/writers/pep_html/template.txt']), + ('docutils/writers/s5_html', + (['docutils/writers/s5_html/README.txt'] + + glob.glob('docutils/writers/s5_html/*/*')))], 'scripts' : ['tools/rst2html.py', 'tools/rst2s5.py', 'tools/rst2latex.py', -- cgit v1.2.1 From dc9b42ad727b763de7db8f4993ca57494c2683bb Mon Sep 17 00:00:00 2001 From: goodger Date: Fri, 9 Dec 2005 04:29:20 +0000 Subject: fixed typo git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4164 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c00ced9d4..0cc46e037 100755 --- a/setup.py +++ b/setup.py @@ -70,7 +70,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 ('docutils/writers/html4css1', ['docutils/writers/html4css1/html4css1.css']), ('docutils/writers/latex2e', - 'docutils/writers/latex2e/latex2e.tex']), + ['docutils/writers/latex2e/latex2e.tex']), ('docutils/writers/newlatex2e', ['docutils/writers/newlatex2e/base.tex']), ('docutils/writers/pep_html', -- cgit v1.2.1 From 2c4fe7fc208cca82d8e5deadf35c7bf3d5ca5985 Mon Sep 17 00:00:00 2001 From: goodger Date: Tue, 13 Dec 2005 17:19:49 +0000 Subject: fixed S5/HTML theme file handling git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4198 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0cc46e037..3991efe6a 100755 --- a/setup.py +++ b/setup.py @@ -34,6 +34,12 @@ def do_setup(): dist = setup(**kwargs) return dist +s5_theme_files = [] +for dir in glob.glob('docutils/writers/s5_html/themes/*'): + if os.path.isdir(dir): + theme_files = glob.glob('%s/*' % dir) + s5_theme_files.append((dir, theme_files)) + package_data = { 'name': 'docutils', 'description': 'Docutils -- Python Documentation Utilities', @@ -65,20 +71,20 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'docutils.writers.s5_html', 'docutils.writers.latex2e', 'docutils.writers.newlatex2e'], - 'data_files': [('docutils/parsers/rst/include', - glob.glob('docutils/parsers/rst/include/*.txt')), - ('docutils/writers/html4css1', - ['docutils/writers/html4css1/html4css1.css']), - ('docutils/writers/latex2e', - ['docutils/writers/latex2e/latex2e.tex']), - ('docutils/writers/newlatex2e', - ['docutils/writers/newlatex2e/base.tex']), - ('docutils/writers/pep_html', - ['docutils/writers/pep_html/pep.css', - 'docutils/writers/pep_html/template.txt']), - ('docutils/writers/s5_html', - (['docutils/writers/s5_html/README.txt'] - + glob.glob('docutils/writers/s5_html/*/*')))], + 'data_files': ([('docutils/parsers/rst/include', + glob.glob('docutils/parsers/rst/include/*.txt')), + ('docutils/writers/html4css1', + ['docutils/writers/html4css1/html4css1.css']), + ('docutils/writers/latex2e', + ['docutils/writers/latex2e/latex2e.tex']), + ('docutils/writers/newlatex2e', + ['docutils/writers/newlatex2e/base.tex']), + ('docutils/writers/pep_html', + ['docutils/writers/pep_html/pep.css', + 'docutils/writers/pep_html/template.txt']), + ('docutils/writers/s5_html/themes', + ['docutils/writers/s5_html/themes/README.txt']),] + + s5_theme_files), 'scripts' : ['tools/rst2html.py', 'tools/rst2s5.py', 'tools/rst2latex.py', -- cgit v1.2.1 From b8025034708700bbfe2d6910f0fab73f2beecffd Mon Sep 17 00:00:00 2001 From: wiemann Date: Sat, 7 Jan 2006 17:05:13 +0000 Subject: Release 0.4: set version number to 0.4 git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4243 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3991efe6a..2e502e1c3 100755 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.3.10', + 'version': '0.4', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From 6865d1b2e0c9d83f02c774a6d66ae28f75fd72bf Mon Sep 17 00:00:00 2001 From: wiemann Date: Sat, 7 Jan 2006 23:58:10 +0000 Subject: Py21/Py22 fix: install data_files to /usr/lib/python-2.x/site-packages instead of /usr/docutils git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4246 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2e502e1c3..0df04c62b 100755 --- a/setup.py +++ b/setup.py @@ -10,18 +10,6 @@ from distutils.command.build_py import build_py from distutils.command.install_data import install_data -class smart_install_data(install_data): - - # From , - # by Pete Shinners. - - def run(self): - #need to change self.install_dir to the library dir - install_cmd = self.get_finalized_command('install') - self.install_dir = getattr(install_cmd, 'install_lib') - return install_data.run(self) - - def do_setup(): kwargs = package_data.copy() extras = get_extras() @@ -54,7 +42,6 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', 'platforms': 'OS-independent', - 'cmdclass': {'install_data': smart_install_data}, 'package_dir': {'docutils': 'docutils', '': 'extras'}, 'packages': ['docutils', 'docutils.languages', @@ -164,4 +151,8 @@ class dual_build_py(build_py): if __name__ == '__main__' : + # From . + from distutils.command.install import INSTALL_SCHEMES + for scheme in INSTALL_SCHEMES.values(): + scheme['data'] = scheme['purelib'] do_setup() -- cgit v1.2.1 From ffae2dc515930e683af10a752b20070a01d0dd34 Mon Sep 17 00:00:00 2001 From: wiemann Date: Sun, 8 Jan 2006 00:03:54 +0000 Subject: fix install.py as well git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4247 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0df04c62b..7f28e9546 100755 --- a/setup.py +++ b/setup.py @@ -150,9 +150,10 @@ class dual_build_py(build_py): self.byte_compile(self.get_outputs(include_bytecode=0)) +# From . +from distutils.command.install import INSTALL_SCHEMES +for scheme in INSTALL_SCHEMES.values(): + scheme['data'] = scheme['purelib'] + if __name__ == '__main__' : - # From . - from distutils.command.install import INSTALL_SCHEMES - for scheme in INSTALL_SCHEMES.values(): - scheme['data'] = scheme['purelib'] do_setup() -- cgit v1.2.1 From 6d0a5717e38ba94f3e1724a9ae68b72d9abae010 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 8 Jan 2006 00:18:54 +0000 Subject: move import to the top; remove unused import git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4249 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7f28e9546..84032bdac 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,11 @@ import os import glob from distutils.core import setup from distutils.command.build_py import build_py -from distutils.command.install_data import install_data + +# From . +from distutils.command.install import INSTALL_SCHEMES +for scheme in INSTALL_SCHEMES.values(): + scheme['data'] = scheme['purelib'] def do_setup(): @@ -150,10 +154,5 @@ class dual_build_py(build_py): self.byte_compile(self.get_outputs(include_bytecode=0)) -# From . -from distutils.command.install import INSTALL_SCHEMES -for scheme in INSTALL_SCHEMES.values(): - scheme['data'] = scheme['purelib'] - if __name__ == '__main__' : do_setup() -- cgit v1.2.1 From 6cdcca30337205e27278c5f4ba87abbda84273c4 Mon Sep 17 00:00:00 2001 From: goodger Date: Sun, 8 Jan 2006 02:01:56 +0000 Subject: revised version info to reflect the current limbo status git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4250 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 84032bdac..ad0c600a3 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.4', + 'version': '0.4-pre', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1 From d9e9593ec5300a630f2aaf03ce6ad73fd06bcd66 Mon Sep 17 00:00:00 2001 From: wiemann Date: Mon, 9 Jan 2006 18:28:09 +0000 Subject: changed version info to "release" git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4260 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ad0c600a3..84032bdac 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ into useful formats, such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60 'url': 'http://docutils.sourceforge.net/', - 'version': '0.4-pre', + 'version': '0.4', 'author': 'David Goodger', 'author_email': 'goodger@users.sourceforge.net', 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)', -- cgit v1.2.1