Move the spawning source code up a level in the directory

That pesky src/ dir has always bothered me Change-Id: I242538c34db43301fde056c3c16015a3d39b9efe
rtyler · Mar 13, 2011 · cae5617 · cae5617
1 parent 9e1221d
commit cae5617
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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 → spawning/__init__.py b/src/spawning/__init__.py → spawning/__init__.py
diff --git a/src/spawning/django_factory.py → spawning/django_factory.py b/src/spawning/django_factory.py → spawning/django_factory.py
diff --git a/src/spawning/memory_watcher.py → spawning/memory_watcher.py b/src/spawning/memory_watcher.py → spawning/memory_watcher.py
diff --git a/src/spawning/paste_factory.py → spawning/paste_factory.py b/src/spawning/paste_factory.py → spawning/paste_factory.py
diff --git a/src/spawning/reloader_dev.py → spawning/reloader_dev.py b/src/spawning/reloader_dev.py → spawning/reloader_dev.py
diff --git a/src/spawning/reloader_svn.py → spawning/reloader_svn.py b/src/spawning/reloader_svn.py → spawning/reloader_svn.py
diff --git a/src/spawning/spawning_child.py → spawning/spawning_child.py b/src/spawning/spawning_child.py → spawning/spawning_child.py
diff --git a/src/spawning/spawning_controller.py → spawning/spawning_controller.py b/src/spawning/spawning_controller.py → spawning/spawning_controller.py
diff --git a/src/spawning/util/__init__.py → spawning/util/__init__.py b/src/spawning/util/__init__.py → spawning/util/__init__.py
diff --git a/src/spawning/util/log_parser.py → spawning/util/log_parser.py b/src/spawning/util/log_parser.py → spawning/util/log_parser.py
diff --git a/src/spawning/util/status.py → spawning/util/status.py b/src/spawning/util/status.py → spawning/util/status.py
diff --git a/src/spawning/util/system.py → spawning/util/system.py b/src/spawning/util/system.py → spawning/util/system.py
diff --git a/src/spawning/wsgi_factory.py → spawning/wsgi_factory.py b/src/spawning/wsgi_factory.py → spawning/wsgi_factory.py