Relocating default settings and templates into the djangopypi package

34 files changed, 29 insertions, 54 deletions

diff --git a/chishop/__init__.py b/chishop/__init__.py
index b56a51c..e69de29 100644
--- a/chishop/__init__.py
+++ b/chishop/__init__.py
@@ -1,2 +0,0 @@
-VERSION = (0, 1, 1)
-__version__ = ".".join(map(str, VERSION))
diff --git a/chishop/media/dists/__init__.py b/chishop/media/dists/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/chishop/media/dists/__init__.py
+++ /dev/null
diff --git a/chishop/production_example.py b/chishop/production_example.py
deleted file mode 100644
index b64623e..0000000
--- a/chishop/production_example.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from conf.default import *
-import os
-
-DEBUG = False
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-     ('chishop', 'example@example.org'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'postgresql_psycopg2'
-DATABASE_NAME = 'chishop'
-DATABASE_USER = 'chishop'
-DATABASE_PASSWORD = 'chishop'
-DATABASE_HOST = ''
-DATABASE_PORT = ''
diff --git a/chishop/settings.py b/chishop/settings.py
index e68a4e5..90ee842 100644
--- a/chishop/settings.py
+++ b/chishop/settings.py
@@ -1,5 +1,5 @@
-from conf.default import *
 import os
+from djangopypi.settings import *
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
diff --git a/chishop/urls.py b/chishop/urls.py
deleted file mode 100644
index 5a5dd77..0000000
--- a/chishop/urls.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.conf.urls.defaults import patterns, url, include, handler404, handler500
-from django.conf import settings
-from django.contrib import admin
-
-admin.autodiscover()
-
-urlpatterns = patterns('')
-
-# Serve static pages.
-if settings.LOCAL_DEVELOPMENT:
-    urlpatterns += patterns("django.views",
-        url(r"^%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", {
-            "document_root": settings.MEDIA_ROOT}))
-
-urlpatterns += patterns("",
-    # Admin interface
-    url(r'^admin/doc/', include("django.contrib.admindocs.urls")),
-    url(r'^admin/(.*)', admin.site.root),
-
-    # Registration
-    url(r'^accounts/', include('registration.backends.default.urls')),
-
-    # The Chishop
-    url(r'', include("djangopypi.urls"))
-)
diff --git a/chishop/conf/__init__.py b/djangopypi/htdocs/media/__init__.py
index e69de29..e69de29 100644
--- a/chishop/conf/__init__.py
+++ b/djangopypi/htdocs/media/__init__.py
diff --git a/chishop/media/__init__.py b/djangopypi/htdocs/media/dists/__init__.py
index e69de29..e69de29 100644
--- a/chishop/media/__init__.py
+++ b/djangopypi/htdocs/media/dists/__init__.py
diff --git a/chishop/media/style/djangopypi.css b/djangopypi/htdocs/media/style/djangopypi.css
index e6fbfd9..e6fbfd9 100644
--- a/chishop/media/style/djangopypi.css
+++ b/djangopypi/htdocs/media/style/djangopypi.css
diff --git a/chishop/manage.py b/djangopypi/manage.py
index 5e78ea9..5e78ea9 100644
--- a/chishop/manage.py
+++ b/djangopypi/manage.py
diff --git a/chishop/conf/default.py b/djangopypi/settings.py
index 97002b6..0fb8716 100644
--- a/chishop/conf/default.py
+++ b/djangopypi/settings.py
@@ -52,13 +52,13 @@ USE_I18N = True
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-here = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-MEDIA_ROOT = os.path.join(here, 'media')
+here = os.path.abspath(os.path.dirname(__file__))
+MEDIA_ROOT = os.path.join(here, 'htdocs', '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).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
+MEDIA_URL = '/htdocs/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
@@ -79,9 +79,10 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.csrf.middleware.CsrfMiddleware',
 )
 
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'djangopypi.urls'
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
diff --git a/chishop/templates/404.html b/djangopypi/templates/404.html
index 9bf4293..9bf4293 100644
--- a/chishop/templates/404.html
+++ b/djangopypi/templates/404.html
diff --git a/chishop/templates/500.html b/djangopypi/templates/500.html
index b30e431..b30e431 100644
--- a/chishop/templates/500.html
+++ b/djangopypi/templates/500.html
diff --git a/chishop/templates/admin/base_site.html b/djangopypi/templates/admin/base_site.html
index 9443eb2..9443eb2 100644
--- a/chishop/templates/admin/base_site.html
+++ b/djangopypi/templates/admin/base_site.html
diff --git a/chishop/templates/base.html b/djangopypi/templates/base.html
index dd797e7..dd797e7 100644
--- a/chishop/templates/base.html
+++ b/djangopypi/templates/base.html
diff --git a/chishop/templates/base_site.html b/djangopypi/templates/base_site.html
index 5257255..5257255 100644
--- a/chishop/templates/base_site.html
+++ b/djangopypi/templates/base_site.html
diff --git a/chishop/templates/djangopypi/pypi.html b/djangopypi/templates/djangopypi/pypi.html
index f98cf44..f98cf44 100644
--- a/chishop/templates/djangopypi/pypi.html
+++ b/djangopypi/templates/djangopypi/pypi.html
diff --git a/chishop/templates/djangopypi/pypi_show_links.html b/djangopypi/templates/djangopypi/pypi_show_links.html
index 13fc2e5..13fc2e5 100644
--- a/chishop/templates/djangopypi/pypi_show_links.html
+++ b/djangopypi/templates/djangopypi/pypi_show_links.html
diff --git a/chishop/templates/djangopypi/search.html b/djangopypi/templates/djangopypi/search.html
index 8269508..8269508 100644
--- a/chishop/templates/djangopypi/search.html
+++ b/djangopypi/templates/djangopypi/search.html
diff --git a/chishop/templates/djangopypi/search_results.html b/djangopypi/templates/djangopypi/search_results.html
index dccf61f..dccf61f 100644
--- a/chishop/templates/djangopypi/search_results.html
+++ b/djangopypi/templates/djangopypi/search_results.html
diff --git a/chishop/templates/djangopypi/show_channel.html b/djangopypi/templates/djangopypi/show_channel.html
index 86d312c..86d312c 100644
--- a/chishop/templates/djangopypi/show_channel.html
+++ b/djangopypi/templates/djangopypi/show_channel.html
diff --git a/chishop/templates/djangopypi/show_links.html b/djangopypi/templates/djangopypi/show_links.html
index 57a1268..57a1268 100644
--- a/chishop/templates/djangopypi/show_links.html
+++ b/djangopypi/templates/djangopypi/show_links.html
diff --git a/chishop/templates/djangopypi/show_version.html b/djangopypi/templates/djangopypi/show_version.html
index d3b393a..d3b393a 100644
--- a/chishop/templates/djangopypi/show_version.html
+++ b/djangopypi/templates/djangopypi/show_version.html
diff --git a/chishop/templates/djangopypi/simple.html b/djangopypi/templates/djangopypi/simple.html
index 6a21d5c..6a21d5c 100644
--- a/chishop/templates/djangopypi/simple.html
+++ b/djangopypi/templates/djangopypi/simple.html
diff --git a/chishop/templates/registration/activate.html b/djangopypi/templates/registration/activate.html
index bc67771..bc67771 100644
--- a/chishop/templates/registration/activate.html
+++ b/djangopypi/templates/registration/activate.html
diff --git a/chishop/templates/registration/activation_complete.html b/djangopypi/templates/registration/activation_complete.html
index c8e8aca..c8e8aca 100644
--- a/chishop/templates/registration/activation_complete.html
+++ b/djangopypi/templates/registration/activation_complete.html
diff --git a/chishop/templates/registration/activation_email.txt b/djangopypi/templates/registration/activation_email.txt
index 0a25329..0a25329 100644
--- a/chishop/templates/registration/activation_email.txt
+++ b/djangopypi/templates/registration/activation_email.txt
diff --git a/chishop/templates/registration/activation_email_subject.txt b/djangopypi/templates/registration/activation_email_subject.txt
index 93618cc..93618cc 100644
--- a/chishop/templates/registration/activation_email_subject.txt
+++ b/djangopypi/templates/registration/activation_email_subject.txt
diff --git a/chishop/templates/registration/login.html b/djangopypi/templates/registration/login.html
index 6c7f799..6c7f799 100644
--- a/chishop/templates/registration/login.html
+++ b/djangopypi/templates/registration/login.html
diff --git a/chishop/templates/registration/logout.html b/djangopypi/templates/registration/logout.html
index 06483a8..06483a8 100644
--- a/chishop/templates/registration/logout.html
+++ b/djangopypi/templates/registration/logout.html
diff --git a/chishop/templates/registration/registration_closed.html b/djangopypi/templates/registration/registration_closed.html
index c92e80b..c92e80b 100644
--- a/chishop/templates/registration/registration_closed.html
+++ b/djangopypi/templates/registration/registration_closed.html
diff --git a/chishop/templates/registration/registration_complete.html b/djangopypi/templates/registration/registration_complete.html
index d9a19cf..d9a19cf 100644
--- a/chishop/templates/registration/registration_complete.html
+++ b/djangopypi/templates/registration/registration_complete.html
diff --git a/chishop/templates/registration/registration_form.html b/djangopypi/templates/registration/registration_form.html
index 719a875..719a875 100644
--- a/chishop/templates/registration/registration_form.html
+++ b/djangopypi/templates/registration/registration_form.html
diff --git a/djangopypi/urls/__init__.py b/djangopypi/urls/__init__.py
index 50fd02b..72ff41d 100644
--- a/djangopypi/urls/__init__.py
+++ b/djangopypi/urls/__init__.py
@@ -1,16 +1,35 @@
 # -*- coding: utf-8 -*-
+from django.conf import settings
+from django.contrib import admin
 from django.conf.urls.defaults import patterns, include
 
+
+admin.autodiscover()
+
+
 urlpatterns = patterns('djangopypi.views',
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    (r'^admin/(.*)', admin.site.root),
+
+    (r'^accounts/', include('registration.backends.default.urls')),
+
     (r'^simple/', include('djangopypi.urls.simple')),
     (r'^channel/', include('djangopypi.urls.channel')),
 
-    (r'^$', 'simple', {'template_name': 'djangopypi/pypi.html'},
-        'djangopypi-pypi'),
-
     (r'^(?P<dist_name>[\w\d_\.\-]+)/$', 'show_links',
         {'template_name': 'djangopypi/pypi_show_links.html'},
         'djangopypi-pypi_show_links'),
 
     (r'^search', 'search', {}, 'djangopypi-search'),
+
+    (r'^$', 'simple', {'template_name': 'djangopypi/pypi.html'},
+        'djangopypi-pypi'),
 )
+
+
+# Serve static pages.
+if settings.LOCAL_DEVELOPMENT:
+    urlpatterns += patterns('django.views',
+        (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'static.serve',
+            {'document_root': settings.MEDIA_ROOT})
+    )
diff --git a/setup.py b/setup.py
index d85e423..055ed75 100755
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,7 @@ setup(
         'django>=1.0',
         'docutils',
         'django-registration==0.8-alpha-1',
+        'django-tagging>=0.3',
     ],
     dependency_links=[
         'http://bitbucket.org/ubernostrum/django-registration/downloads',