Work on PyPI packaging

6 files changed, 64 insertions, 23 deletions

diff --git a/COPYING b/LICENSE.txt
index 94a9ed0..94a9ed0 100644
--- a/COPYING
+++ b/LICENSE.txt
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..d7b289e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,14 @@
+include *.txt COPYING
+include chimere/tests/*
+prune docs/*/build/
+prune example_project/local_settings.py
+include example_project/*.sample
+include docs/*/*.rst Makefile
+include docs/*/Makefile
+include docs/*/conf.py
+include docs/*/static/*.png
+recursive-include apache *.conf *.wsgi
+recursive-include chimere/templates *.html *.csv *.kml
+recursive-include chimere/static *.css *.js *.png *.gif *.swf
+recursive-include chimere/locale *.po
+recursive-include chimere/fixtures *.json
diff --git a/README b/README
deleted file mode 100644
index 6faac19..0000000
--- a/README
+++ /dev/null
@@ -1,3 +0,0 @@
-To generate the documentation run the generate script in the docs directory.
-By default the documentation is generated in english. To generate for a
-different language add the appropriate language code as a parameter.
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..a989d5f
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,33 @@
+=======
+Chimère
+=======
+
+Chimère is a cartographic mashup using OpenStreetMap as a default map layer.
+This software aims to create online collaborative and thematic maps. Content
+(multimedia, text) are associated to basic geographics items (Point Of Interest,
+routes). Add on the map are open to everybody with no authentification but are
+moderated by a team in charge of the map.
+
+Features:
+ - Display (by default) of the mapnik OpenStreetMap layer.
+ - Display on the map of POIs (with markers) and routes (with colored
+   polylines).
+ - Thematic choices of items to display (POIs and routes).
+ - Filter themes in regard to currently available items.
+ - Display of the detail of a POI (name, description, pictures, multimedia
+   files).
+ - Add of a cartographic item (POI, route) on the map by an user without
+   authentication (the item is only available after moderation).
+ - Admin interface for moderation and configuration.
+ - Cut a Chimère by "areas". Each "area" can have specific themes, a new default
+   center, welcome message, bounding box, allow of restriction to a bounding
+   box, activation of dynamic themes, available themes, themes checked by
+   default.
+ - Import and export of data. Available formats are: ShapeFile, KML, GeoRSS
+   (import only), CSV and OSM.
+ - Configuration of map layers in administration interface. By default these
+   cartographic items are available: OSM Mapnik, MapQuest, OSM Transport,
+   Cyclemap.
+
+
+Full documentation is available on `Read the docs <http://chimere.readthedocs.org/en/latest/>`_.
diff --git a/chimere/__init__.py b/chimere/__init__.py
index a7083c7..f4026c3 100644
--- a/chimere/__init__.py
+++ b/chimere/__init__.py
@@ -1,12 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Copyright (C) 2012  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+import os
+os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings'
 
 from django.utils.translation import ugettext as _
 
-# templates/chimere/edit.html, templates/chimere/edit_route.html
-_(u"Multimedia files")
-_(u"Picture files")
+try:
+    # strings to be considered for translation
+    # templates/chimere/edit.html, templates/chimere/edit_route.html
+    _(u"Multimedia files")
+    _(u"Picture files")
+except ImportError:
+    pass
 
 VERSION = (2, 0)
 
diff --git a/setup.py b/setup.py
index ca0c460..0e990a4 100644
--- a/setup.py
+++ b/setup.py
@@ -10,30 +10,21 @@ try:
 except (IOError, OSError):
     reqs = ''
 
-def list_folder(path, extensions):
-    """
-    Recursive function to list folders
-    extensions may be a list like ["css", "js", "html"]
-    """
-    final = []
-    for root, subfolders, filenames in os.walk(path):
-        for subfolder in subfolders:
-            for ext in extensions:
-                final.append("%s/%s/*.%s" % (root[len("chimere/"):], subfolder, ext))
-    return final
-
 setup(
     name='chimere',
     version=chimere.get_version(),
     description=
-    """Chimere is a kind of online “mashup” which is designed to aggregate geographic data from several sources. Chimere gets a map from OpenStreetMap and display other data added by users. Datas are freely submitted by visitors and then validated by an administrator.""",
-    author='Étienne Loks',
+    "Chimere is a kind of online “mashup” which is designed to aggregate "\
+    "geographic data from several sources. Chimere gets a map from "\
+    "OpenStreetMap and display other data added by users. Datas are freely "\
+    "submitted by visitors and then validated by an administrator.",
+    long_description=open('README.txt').read(),
+    author=u'Étienne Loks',
     author_email='etienne.loks@peacefrogs.net',
     url='http://blog.peacefrogs.net/nim/chimere/',
-    packages=find_packages(exclude=["example", "example.*",]),
+    license='GPL v3 licence, see COPYING',
+    packages=find_packages(),
     include_package_data=True,
-    package_data={
-            'chimere': list_folder(os.path.join('chimere', 'static'), ["css", "js", "png"]) + list_folder(os.path.join('chimere', 'templates'), ["html"])},
     install_requires=reqs,
     classifiers=[
         'Development Status :: 4 - Beta',