Configure for publications on pypi, descriptions, etc.

1 files changed, 15 insertions, 12 deletions

diff --git a/setup.py b/setup.py
index d963a43be..25e78d0b2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
-from setuptools import setup, find_packages
-import ishtar_common
+from setuptools import setup  # , find_packages
+import version
 
 try:
     reqs = open(os.path.join(os.path.dirname(__file__),
@@ -11,20 +11,23 @@ except (IOError, OSError):
 
 setup(
     name='ishtar',
-    version=ishtar_common.get_version(),
-    description=
-    "Ishtar is..."\
-    "... and ...",
-    long_description=open('README.txt').read(),
+    version=version.get_version(),
+    description="Ishtar is a database to manage the furniture and "
+                "documentation from archaeological operations.",
+    long_description=open('README.rst').read(),
     author=u'Étienne Loks',
-    author_email='etienne.loks@peacefrogs.net',
-    url='http://pypi.python.org/pypi/ishtar',
+    author_email='etienne.loks@iggdrasil.net',
+    url='http://ishtar-archeo.net/',
     license='AGPL v3 licence, see COPYING',
-    packages=find_packages(),
+    packages=[
+        'archaeological_finds', 'example_project',
+        'archaeological_warehouse', 'archaeological_files_pdl',
+        'archaeological_files', 'xhtml2odt', 'simple_history', 'ishtar_common',
+        'archaeological_operations', 'archaeological_context_records',
+        'ishtar_pdl'],
     include_package_data=True,
     install_requires=reqs,
-    setup_requires=['setuptools-git'],
-    #test_suite = "",
+    # test_suite = "",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',