diff --git a/MANIFEST.in b/MANIFEST.in index 2975b67..a0fd245 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ include *.txt *.rst *.py -recursive-include src/spawning *.py -recursive-include src/Spawning.egg-info * +recursive-include spawning *.py recursive-include rc-scripts * diff --git a/setup.py b/setup.py index 5c294ca..acde1fa 100755 --- a/setup.py +++ b/setup.py @@ -21,8 +21,6 @@ import sys -# Insert src/ into our path so we can pull the version and include it -sys.path.insert(0, 'src') from spawning import __version__ from os import path @@ -50,8 +48,8 @@ maintainer='R. Tyler Croy', maintainer_email='tyler@monkeypox.org', include_package_data = True, - packages = find_packages('src'), - package_dir = {'': 'src'}, + packages = ['spawning'], + package_dir = {'': '.'}, version=__version__, install_requires=install_requires, entry_points={ diff --git a/src/spawning/__init__.py b/spawning/__init__.py similarity index 100% rename from src/spawning/__init__.py rename to spawning/__init__.py diff --git a/src/spawning/django_factory.py b/spawning/django_factory.py similarity index 100% rename from src/spawning/django_factory.py rename to spawning/django_factory.py diff --git a/src/spawning/memory_watcher.py b/spawning/memory_watcher.py similarity index 100% rename from src/spawning/memory_watcher.py rename to spawning/memory_watcher.py diff --git a/src/spawning/paste_factory.py b/spawning/paste_factory.py similarity index 100% rename from src/spawning/paste_factory.py rename to spawning/paste_factory.py diff --git a/src/spawning/reloader_dev.py b/spawning/reloader_dev.py similarity index 100% rename from src/spawning/reloader_dev.py rename to spawning/reloader_dev.py diff --git a/src/spawning/reloader_svn.py b/spawning/reloader_svn.py similarity index 100% rename from src/spawning/reloader_svn.py rename to spawning/reloader_svn.py diff --git a/src/spawning/spawning_child.py b/spawning/spawning_child.py similarity index 100% rename from src/spawning/spawning_child.py rename to spawning/spawning_child.py diff --git a/src/spawning/spawning_controller.py b/spawning/spawning_controller.py similarity index 100% rename from src/spawning/spawning_controller.py rename to spawning/spawning_controller.py diff --git a/src/spawning/util/__init__.py b/spawning/util/__init__.py similarity index 100% rename from src/spawning/util/__init__.py rename to spawning/util/__init__.py diff --git a/src/spawning/util/log_parser.py b/spawning/util/log_parser.py similarity index 100% rename from src/spawning/util/log_parser.py rename to spawning/util/log_parser.py diff --git a/src/spawning/util/status.py b/spawning/util/status.py similarity index 100% rename from src/spawning/util/status.py rename to spawning/util/status.py diff --git a/src/spawning/util/system.py b/spawning/util/system.py similarity index 100% rename from src/spawning/util/system.py rename to spawning/util/system.py diff --git a/src/spawning/wsgi_factory.py b/spawning/wsgi_factory.py similarity index 100% rename from src/spawning/wsgi_factory.py rename to spawning/wsgi_factory.py