Better project layout, now setup.py installs djangopypi

15 files changed, 59 insertions, 16 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 45e2f40..9ab6242 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,5 @@ include AUTHORS
 include README
 include TODO
 include MANIFEST.in
+recursive-include djangopypi *
 recursive-include manifest *
diff --git a/chishop/djangopypi/__init__.py b/chishop/djangopypi/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/chishop/djangopypi/__init__.py
+++ /dev/null
diff --git a/chishop/media/_ b/chishop/media/_
deleted file mode 100755
index e69de29..0000000
--- a/chishop/media/_
+++ /dev/null
diff --git a/chishop/media/dists/django-greystripe-0.1.tar.gz b/chishop/media/dists/django-greystripe-0.1.tar.gz
deleted file mode 100755
index bef3dd7..0000000
--- a/chishop/media/dists/django-greystripe-0.1.tar.gz
+++ /dev/null
diff --git a/chishop/media/foo.txt b/chishop/media/foo.txt
deleted file mode 100755
index e69de29..0000000
--- a/chishop/media/foo.txt
+++ /dev/null
diff --git a/chishop/settings.py b/chishop/settings.py
index 8c18760..2ff0103 100644
--- a/chishop/settings.py
+++ b/chishop/settings.py
@@ -1,28 +1,38 @@
 # Django settings for djangopypi project.
 import os
 
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-LOCAL_DEVELOPMENT = True
+# ####
+# This are the settings you're most likely to change
+# when running the chishop servber.
 
-if LOCAL_DEVELOPMENT:
-    import os
-    import sys
-    sys.path.append(os.path.dirname(__file__))
+# If this is true errors will have informative error pages.
+DEBUG = True
 
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
 
-MANAGERS = ADMINS
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+# Uploaded python distributions will be saved in the
+# dists/ directory under this path.
+here = os.path.abspath(os.path.dirname(__file__))
+MEDIA_ROOT = os.path.join(here, 'media')
+
+
+# Database settings.
 
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = 'devdatabase.db'
+DATABASE_ENGINE = 'sqlite3'         # or mysql
+DATABASE_NAME = 'devdatabase.db' 
 DATABASE_USER = ''
 DATABASE_PASSWORD = ''
 DATABASE_HOST = ''
 DATABASE_PORT = ''
 
+
+# ###### --- settings below here, are probably not that important ---- #####
+
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -34,16 +44,15 @@ TIME_ZONE = 'America/Chicago'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
 
+MANAGERS = ADMINS
+TEMPLATE_DEBUG = DEBUG
+LOCAL_DEVELOPMENT = DEBUG
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-here = os.path.abspath(os.path.dirname(__file__))
-MEDIA_ROOT = os.path.join(here, 'media')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
diff --git a/djangopypi/__init__.py b/djangopypi/__init__.py
new file mode 100644
index 0000000..148c185
--- /dev/null
+++ b/djangopypi/__init__.py
@@ -0,0 +1,33 @@
+""" djangopypi.py
+Copyright (c) 2009, Ask Solem
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+Neither the name of Ask Solem nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific
+prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+"""
+
+VERSION = (0, 1, 0)
+__version__ = ".".join(map(str, VERSION))
diff --git a/chishop/djangopypi/admin.py b/djangopypi/admin.py
index 30290e0..30290e0 100644
--- a/chishop/djangopypi/admin.py
+++ b/djangopypi/admin.py
diff --git a/chishop/djangopypi/forms.py b/djangopypi/forms.py
index 1cf9a9d..1cf9a9d 100644
--- a/chishop/djangopypi/forms.py
+++ b/djangopypi/forms.py
diff --git a/chishop/djangopypi/models.py b/djangopypi/models.py
index d66f5c8..d66f5c8 100644
--- a/chishop/djangopypi/models.py
+++ b/djangopypi/models.py
diff --git a/chishop/djangopypi/templates/djangopypi/show_links.html b/djangopypi/templates/djangopypi/show_links.html
index b805f47..b805f47 100644
--- a/chishop/djangopypi/templates/djangopypi/show_links.html
+++ b/djangopypi/templates/djangopypi/show_links.html
diff --git a/chishop/djangopypi/templates/djangopypi/show_version.html b/djangopypi/templates/djangopypi/show_version.html
index f0c9d75..f0c9d75 100644
--- a/chishop/djangopypi/templates/djangopypi/show_version.html
+++ b/djangopypi/templates/djangopypi/show_version.html
diff --git a/chishop/djangopypi/templates/djangopypi/simple.html b/djangopypi/templates/djangopypi/simple.html
index de761a5..de761a5 100644
--- a/chishop/djangopypi/templates/djangopypi/simple.html
+++ b/djangopypi/templates/djangopypi/simple.html
diff --git a/chishop/djangopypi/views.py b/djangopypi/views.py
index fc4061d..fc4061d 100644
--- a/chishop/djangopypi/views.py
+++ b/djangopypi/views.py
diff --git a/setup.py b/setup.py
index 24a52c7..c761b61 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,11 @@ except ImportError:
 
 setup(
     name='chishop',
-    version=__import__('chishop').__version__,
+    version=__import__('djangopypi').__version__,
     description='Simple PyPI server written in Django.',
     author='Ask Solem',
     author_email='askh@opera.com',
-    packages=[],
+    packages=["djangopypi"],
     install_requires=[
         'django>=1.0',
     ],