Added proper structure

24 files changed, 311 insertions, 42 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2e00023
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+.DS_Store
+*.pyc
+*~
+*.sqlite
+*.sqlite-journal
+settings_local.py
+.*.sw[po]
+dist/
+*.egg-info
+doc/__build/*
+pip-log.txt
+devdatabase.db
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..292eeb3
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Ask Solem <askh@opera.com>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..81d19ce
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,28 @@
+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.
+
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..45e2f40
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include AUTHORS
+include README
+include TODO
+include MANIFEST.in
+recursive-include manifest *
diff --git a/README b/README
new file mode 100644
index 0000000..c67679c
--- /dev/null
+++ b/README
@@ -0,0 +1,30 @@
+=========================================
+ChiShop/DjangoPyPI
+=========================================
+:Version: 0.1
+:Authors:
+    Ask Solem (askh@opera.com)
+
+Installation
+============
+
+First you have to install the dependencies::
+
+    $ python setup.py build
+    # python setup.py install # (run as root)
+
+Initial configuration
+---------------------
+
+    $ python manage.py syncdb
+
+Run the PyPI server
+-------------------
+
+    $ python manage.py runserver
+
+Contact Information
+====================
+askh@opera.com
+
+.. # vim: syntax=rst expandtab tabstop=4 shiftwidth=4 shiftround
diff --git a/__init__.py b/TODO
index e69de29..e69de29 100644
--- a/__init__.py
+++ b/TODO
diff --git a/chishop/__init__.py b/chishop/__init__.py
new file mode 100644
index 0000000..33c912b
--- /dev/null
+++ b/chishop/__init__.py
@@ -0,0 +1,33 @@
+""" chishop.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/djangopypi/__init__.py b/chishop/djangopypi/__init__.py
index e69de29..e69de29 100644
--- a/djangopypi/__init__.py
+++ b/chishop/djangopypi/__init__.py
diff --git a/chishop/djangopypi/admin.py b/chishop/djangopypi/admin.py
new file mode 100644
index 0000000..30290e0
--- /dev/null
+++ b/chishop/djangopypi/admin.py
@@ -0,0 +1,38 @@
+""" admin.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.
+
+"""
+
+from django.contrib import admin
+from djangopypi.models import Project, Release, Classifier
+
+admin.site.register(Project)
+admin.site.register(Release)
+admin.site.register(Classifier)
diff --git a/chishop/djangopypi/forms.py b/chishop/djangopypi/forms.py
new file mode 100644
index 0000000..1cf9a9d
--- /dev/null
+++ b/chishop/djangopypi/forms.py
@@ -0,0 +1,63 @@
+""" forms.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.
+
+"""
+
+from django import forms
+from djangopypi.models import Project, Classifier, Release
+
+
+class ProjectRegisterForm(forms.Form):
+    name = forms.CharField()
+    license = forms.CharField(required=False)
+    metadata_version = forms.CharField(initial="1.0")
+    author = forms.CharField(required=False)
+    home_page = forms.CharField(required=False)
+    download_url = forms.CharField(required=False)
+    summary = forms.CharField(required=False)
+    description = forms.CharField(required=False)
+    author_email = forms.CharField(required=False)
+    version = forms.CharField()
+    platform = forms.CharField(required=False)
+
+    def save(self, classifiers, file=None):
+        values = dict(self.cleaned_data)
+        name = values.pop("name")
+        version = values.pop("version")
+        platform = values.pop("platform")
+        project, c = Project.objects.get_or_create(name=name, defaults=values)
+        for classifier in classifiers:
+            project.classifiers.add(
+                    Classifier.objects.get_or_create(name=classifier)[0])
+        release, c = Release.objects.get_or_create(version=version,
+                platform=platform, project=project)
+        if file:
+            release.distribution.save(file.name, file, save=True)
+            release.save()
diff --git a/djangopypi/models.py b/chishop/djangopypi/models.py
index 34276a5..d66f5c8 100644
--- a/djangopypi/models.py
+++ b/chishop/djangopypi/models.py
@@ -1,3 +1,35 @@
+""" models.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.
+
+"""
+
 import os
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
@@ -30,6 +62,7 @@ ARCHITECTURES = (
     ("ultrasparc", "UltraSparc"),
 )
 
+
 class Classifier(models.Model):
     name = models.CharField(max_length=255, unique=True)
 
@@ -40,6 +73,7 @@ class Classifier(models.Model):
     def __unicode__(self):
         return self.name
 
+
 class Project(models.Model):
     name = models.CharField(max_length=255, unique=True)
     license = models.CharField(max_length=255, blank=True)
@@ -59,6 +93,7 @@ class Project(models.Model):
     def __unicode__(self):
         return self.name
 
+
 class Release(models.Model):
     version = models.CharField(max_length=128)
     distribution = models.FileField(upload_to="dists")
@@ -82,4 +117,3 @@ class Release(models.Model):
     @property
     def path(self):
         return self.distribution.name
-
diff --git a/djangopypi/templates/djangopypi/show_links.html b/chishop/djangopypi/templates/djangopypi/show_links.html
index b805f47..b805f47 100644
--- a/djangopypi/templates/djangopypi/show_links.html
+++ b/chishop/djangopypi/templates/djangopypi/show_links.html
diff --git a/djangopypi/templates/djangopypi/show_version.html b/chishop/djangopypi/templates/djangopypi/show_version.html
index f0c9d75..f0c9d75 100644
--- a/djangopypi/templates/djangopypi/show_version.html
+++ b/chishop/djangopypi/templates/djangopypi/show_version.html
diff --git a/djangopypi/templates/djangopypi/simple.html b/chishop/djangopypi/templates/djangopypi/simple.html
index de761a5..de761a5 100644
--- a/djangopypi/templates/djangopypi/simple.html
+++ b/chishop/djangopypi/templates/djangopypi/simple.html
diff --git a/djangopypi/views.py b/chishop/djangopypi/views.py
index 7136dda..fc4061d 100644
--- a/djangopypi/views.py
+++ b/chishop/djangopypi/views.py
@@ -1,4 +1,35 @@
-# Create your views here.
+""" views.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.
+
+"""
+
 from django.http import HttpResponse, HttpResponseBadRequest, QueryDict
 from django.shortcuts import render_to_response
 from djangopypi.models import Project
diff --git a/manage.py b/chishop/manage.py
index 5e78ea9..5e78ea9 100644
--- a/manage.py
+++ b/chishop/manage.py
diff --git a/media/_ b/chishop/media/_
index e69de29..e69de29 100755
--- a/media/_
+++ b/chishop/media/_
diff --git a/media/dists/django-greystripe-0.1.tar.gz b/chishop/media/dists/django-greystripe-0.1.tar.gz
index bef3dd7..bef3dd7 100755
--- a/media/dists/django-greystripe-0.1.tar.gz
+++ b/chishop/media/dists/django-greystripe-0.1.tar.gz
diff --git a/media/foo.txt b/chishop/media/foo.txt
index e69de29..e69de29 100755
--- a/media/foo.txt
+++ b/chishop/media/foo.txt
diff --git a/settings.py b/chishop/settings.py
index 8c18760..8c18760 100644
--- a/settings.py
+++ b/chishop/settings.py
diff --git a/urls.py b/chishop/urls.py
index f6709f8..f6709f8 100644
--- a/urls.py
+++ b/chishop/urls.py
diff --git a/djangopypi/admin.py b/djangopypi/admin.py
deleted file mode 100644
index 6e20fd3..0000000
--- a/djangopypi/admin.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.contrib import admin
-from djangopypi.models import Project, Release
-
-admin.site.register(Project)
-admin.site.register(Release)
diff --git a/djangopypi/forms.py b/djangopypi/forms.py
deleted file mode 100644
index 922301b..0000000
--- a/djangopypi/forms.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from django import forms
-from djangopypi.models import Project, Classifier, Release
-
-class ProjectRegisterForm(forms.Form):
-    name = forms.CharField()
-    license = forms.CharField(required=False)
-    metadata_version = forms.CharField(initial="1.0")
-    author = forms.CharField(required=False)
-    home_page = forms.CharField(required=False)
-    download_url = forms.CharField(required=False)
-    summary = forms.CharField(required=False)
-    description = forms.CharField(required=False)
-    author_email = forms.CharField(required=False)
-    version = forms.CharField()
-    platform = forms.CharField(required=False)
-
-    def save(self, classifiers, file=None):
-        values = dict(self.cleaned_data)
-        name = values.pop("name")
-        version = values.pop("version")
-        platform = values.pop("platform")
-        project, c = Project.objects.get_or_create(name=name, defaults=values)
-        for classifier in classifiers:
-            project.classifiers.add(
-                    Classifier.objects.get_or_create(name=classifier)[0])
-        release, c = Release.objects.get_or_create(version=version,
-                platform=platform, project=project)
-        if file:
-            release.distribution.save(file.name, file, save=True)
-            release.save()
-
-
-    
-
-
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..24a52c7
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import codecs
+
+try:
+    from setuptools import setup, find_packages
+except ImportError:
+    from ez_setup import use_setuptools
+    use_setuptools()
+    from setuptools import setup, find_packages
+
+setup(
+    name='chishop',
+    version=__import__('chishop').__version__,
+    description='Simple PyPI server written in Django.',
+    author='Ask Solem',
+    author_email='askh@opera.com',
+    packages=[],
+    install_requires=[
+        'django>=1.0',
+    ],
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Environment :: Web Environment",
+        "Framework :: Django",
+        "Operating System :: OS Independent",
+        "Intended Audience :: Developers",
+        "Intended Audience :: System Administrators",
+        "License :: OSI Approved :: BSD License",
+        "Programming Language :: Python",
+    ],
+    long_description=codecs.open('README', "r", "utf-8").read(),
+)