Simplify layout

git-svn-id: http://svn.osafoundation.org/vobject/trunk@195 72e31ff3-66e1-0310-9094-9c83e53ae81d
JordanReiter · May 28, 2008 · 481cd37 · 481cd37
1 parent 120d5ca
commit 481cd37
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -14,30 +14,23 @@
 from ez_setup import use_setuptools
 use_setuptools()
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
-#from distutils.core import setup
-
-# Metadata
-PACKAGE_NAME = "vobject"
-PACKAGE_VERSION = "0.6.0"
-
-ALL_EXTS = ['*.py', '*.ics', '*.txt']
-
-packages = ['vobject']
+# ALL_EXTS = ['*.py', '*.ics', '*.txt']
 
 doclines = __doc__.splitlines()
 
 setup(name = "vobject",
-      version = PACKAGE_VERSION,
+      version = "0.6.0",
       author = "Jeffrey Harris",
       author_email = "jeffrey@osafoundation.org",
       license = "Apache",
       zip_safe = True,
       url = "http://vobject.skyhouseconsulting.com",
       entry_points = { 'console_scripts': ['ics_diff = vobject.ics_diff:main'] },
-      package_dir = {'':'src'},
-      package_data = {'': ALL_EXTS},
+#       package_dir = {'':'vobject'},
+      include_package_data = True,
+#       package_data = {'': ALL_EXTS},
 
       install_requires = ['python-dateutil >= 1.1'], 
 

diff --git a/tests/more_tests.txt → test_files/more_tests.txt b/tests/more_tests.txt → test_files/more_tests.txt
diff --git a/tests/recurrence.ics → test_files/recurrence.ics b/tests/recurrence.ics → test_files/recurrence.ics
diff --git a/tests/tests.py → test_files/tests.py b/tests/tests.py → test_files/tests.py
diff --git a/tests/utf8_test.ics → test_files/utf8_test.ics b/tests/utf8_test.ics → test_files/utf8_test.ics
diff --git a/src/vobject/__init__.py → vobject/__init__.py b/src/vobject/__init__.py → vobject/__init__.py
diff --git a/src/vobject/base.py → vobject/base.py b/src/vobject/base.py → vobject/base.py
diff --git a/src/vobject/behavior.py → vobject/behavior.py b/src/vobject/behavior.py → vobject/behavior.py
diff --git a/src/vobject/hcalendar.py → vobject/hcalendar.py b/src/vobject/hcalendar.py → vobject/hcalendar.py
diff --git a/src/vobject/icalendar.py → vobject/icalendar.py b/src/vobject/icalendar.py → vobject/icalendar.py
diff --git a/src/vobject/ics_diff.py → vobject/ics_diff.py b/src/vobject/ics_diff.py → vobject/ics_diff.py
diff --git a/src/vobject/vcard.py → vobject/vcard.py b/src/vobject/vcard.py → vobject/vcard.py
diff --git a/src/vobject/win32tz.py → vobject/win32tz.py b/src/vobject/win32tz.py → vobject/win32tz.py