Merge lp:~maphew/leo-editor/pypi-packaging into lp:leo-editor

[Matt Wilkie]

Updated `setup.py` for Leo-4.10-final, added "Classifiers" as made sense to me. The resultant source build package was uploaded to the testing Python Package Index server, from which `pip install leo-editor` is successful.

A windows binary distribution build does not appear to be necessary.

Known limitations: __py-cache__ files are included, but shouldn't be.

Recipe:
------

Add 'testing' section to .pypirc, then:

    python setup.py register -r testing
    python setup.py sdist upload -r testing
    pip install -i https://testpypi.python.org/pypi leo-editor

.pypirc:
--------
[distutils]
index-servers =
    pypi
    testing

[pypi]
username:maphew

[testing]
repository:http://testpypi.python.org/pypi
username:maphew
password:SuperSecret123Words

#note: upload failed without the password in file in clear text. I lost patience troubleshooting and just let it ride for now.

[lp:~maphew/leo-editor/pypi-packaging]

5722. By Edward K. Ream on 2013-04-18

merged EKR's docutils work

5723. By tbnorth on 2013-04-18

patch from SegundoBob to avoid leading space inserting date into empty
headline

5724. By tbnorth on 2013-04-18

less code better, remove one line (trivial)

5725. By Ville M. Vainio on 2013-04-18

Merge Matt Wilkies' setup.py mods

[Edward K. Ream (edreamleo)]

On Thu, Apr 18, 2013 at 2:39 PM, <email address hidden> wrote:

> The proposal to merge lp:~maphew/leo-editor/pypi-packaging into
> lp:leo-editor has been updated.
>
> Status: Needs review => Merged
>

Thanks for this.

Edward

[Matt Wilkie (maphew)]

you're welcome :)

I've just pushed a minor change to trunk, r5760. hope that's okay. Change
is to use the actual current version number and add myself as temporary
package maintainer (more on this later).

-matt

On Tue, Apr 30, 2013 at 2:46 PM, Edward K. Ream <email address hidden> wrote:

> On Thu, Apr 18, 2013 at 2:39 PM, <email address hidden> wrote:
>
> > The proposal to merge lp:~maphew/leo-editor/pypi-packaging into
> > lp:leo-editor has been updated.
> >
> > Status: Needs review => Merged
> >
>
> Thanks for this.
>
> Edward
>
> --
> https://code.launchpad.net/~maphew/leo-editor/pypi-packaging/+merge/159561
> You are the owner of lp:~maphew/leo-editor/pypi-packaging.
>

=== modified file 'setup.py'
--- setup.py	2011-06-12 12:34:11 +0000
+++ setup.py	2013-04-18 07:23:30 +0000
@@ -1,9 +1,9 @@
-#@+leo-ver=4-thin
-#@+node:ville.20090213231648.1:@thin ~/leo-editor/setup.py
+#@+leo-ver=5-thin
+#@+node:maphew.20130415133445.2159: * @file leo-editor/setup.py
 #@@language python
 #@@tabwidth -4
 #@+others
-#@+node:ville.20090213231648.2:setup declarations
+#@+node:ville.20090213231648.2: ** setup declarations
 
 #from setuptools import setup,find_packages
 
@@ -19,8 +19,7 @@
 from distutils.command.install_data import install_data
 from distutils.command.install import INSTALL_SCHEMES
 import os,fnmatch
-#@-node:ville.20090213231648.2:setup declarations
-#@+node:ville.20090213231648.3:fullsplit
+#@+node:ville.20090213231648.3: ** fullsplit
 import sys
 
 def fullsplit(path, result=None):
@@ -37,17 +36,14 @@
         return result
     return fullsplit(head, [tail] + result)
 
-#@-node:ville.20090213231648.3:fullsplit
-#@+node:ville.20090213231648.4:purelib hack
+#@+node:ville.20090213231648.4: ** purelib hack
 # Tell distutils to put the data_files in platform-specific installation
 # locations. See here for an explanation:
 # http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
 for scheme in list(INSTALL_SCHEMES.values()):
     scheme['data'] = scheme['purelib']
-#@+node:ville.20090213233714.2:@url http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
-#@-node:ville.20090213233714.2:@url http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
-#@-node:ville.20090213231648.4:purelib hack
-#@+node:ville.20090213231648.5:collect (and filter) files
+#@+node:ville.20090213233714.2: *3* @url http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
+#@+node:ville.20090213231648.5: ** collect (and filter) files
 # Compile the list of packages available, because distutils doesn't have
 # an easy way to do this.
 packages, data_files = [], []
@@ -87,14 +83,12 @@
 #cleanup unwanted data files
 
 
-#@-node:ville.20090213231648.5:collect (and filter) files
-#@+node:ville.20090213231648.6:bdist_wininst hack
+#@+node:ville.20090213231648.6: ** bdist_wininst hack
 # Small hack for working with bdist_wininst.
 # See http://mail.python.org/pipermail/distutils-sig/2004-August/004134.html
 if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
     for file_info in data_files:
         file_info[0] = '\\PURELIB\\%s' % file_info[0]
-#@-node:ville.20090213231648.6:bdist_wininst hack
 #@-others
 
 
@@ -102,22 +96,56 @@
 datapats = ['.tix', '.GIF', '.dbm', '.conf', '.TXT', '.xml', '.gif', '*.leo', '.def', '.svg', '*.ini', '.six', '.bat', '.cat', '.pro', '.sh', '.xsl', '.bmp', '.js', '*.ui', '.rix', '.pmsp',  '.pyd', '.png', '.alg', '.php',  '.css', '.ico', '*.txt', '.html',  '.iix',  '.w']
 #print data_files
 
+# variable order matches order on pkg info page, but that's just a niceity
+# https://testpypi.python.org/pypi?name=leo-editor&version=4.10-final&:action=submit_form
 setup(
     name = 'leo-editor',
-    version = "4.7.1",
+    version = "4.10-final",
     author = "Edward K. Ream",
     author_email = '[e-mail]',
-    url = 'http://webpages.charter.net/edreamleo/front.html',
+    #maintainer = '',
+    #maintainer_email = '',
+    url = 'http://leoeditor.com',
+    license = 'MIT License',
+    description = "Leonine Editor with Outlines",
+    long_description = """
+Leo is an outline-oriented IDE written in 100% pure Python.
+Leo features a multi-window outlining editor, Python colorizing,
+powerful outline commands and many other things, including 
+unlimited Undo/Redo and an integrated Python shell(IDLE) window.
+Leo requires Python 2.6 or above.  Leo works with Python 3.x.
+Requires PyQt and SIP preinstalled.
+    """,
+    #keywords = [],
+    platforms = ['linux','windows'],
+    download_url = 'http://sourceforge.net/projects/leo/files/Leo/4.10%20final/Leo-4.10-final.zip/download',
+    #bugtrack_url = 'https://bugs.launchpad.net/leo-editor',    #only py3?
+
+    # only include dependencies which can be installed by pip
+    requires = ['docutils'],
+
+    #provides = [],
+    #obsoletes= [],    
+    classifiers = [
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Win32 (MS Windows)',
+        'Environment :: X11 Applications :: Qt',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 3',
+        'Topic :: Software Development',
+        'Topic :: Text Editors',
+        'Topic :: Text Processing',
+        ],
+
     packages = packages,
     data_files = data_files,
     package_data = {'leo.plugins' : datapats },
-    description = "A programmer's editor/outliner, and much more",
-    long_description = """
-Leo is an outline-oriented editor written in 100% pure Python.
-Leo features a multi-window outlining editor, syntax colorizing,
-powerful outline commands and many other things, including 
-unlimited Undo/Redo and scriptability.
-    """,
     scripts = ['leo/scripts/leo'],
 
     #entry_points = {
@@ -130,5 +158,4 @@
     #    }
 
 )
-#@-node:ville.20090213231648.1:@thin ~/leo-editor/setup.py
 #@-leo