From d7552429ded57a11af32c94fe824f9db7fe78fa1 Mon Sep 17 00:00:00 2001
From: Ed Crewe <edmundcrewe@gmail.com>
Date: Tue, 11 Aug 2015 15:37:43 +0100
Subject: [PATCH 1/4] make the setup use latest django with
 django-registration-redux maintained version - plus kill . import

---
 djangopypi2/website/settings.py | 4 ++--
 setup.py                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/djangopypi2/website/settings.py b/djangopypi2/website/settings.py
index 8c6212d..32b9c2c 100644
--- a/djangopypi2/website/settings.py
+++ b/djangopypi2/website/settings.py
@@ -2,7 +2,7 @@
 import os
 import sys
 import urlparse
-from . import user_settings
+from djangopypi2.website import user_settings
 
 def ensure_directory(path):
     try:
@@ -123,7 +123,7 @@ def find_project_root():
     'djangopypi2.apps.pypi_manage',
     'djangopypi2.apps.pypi_metadata',
     'djangopypi2.apps.pypi_packages',
-    'djangopypi2.apps.pypi_frontend',
+    'djangopypi2.apps.pypi_frontend'
 )
 
 ACCOUNT_ACTIVATION_DAYS = 7
diff --git a/setup.py b/setup.py
index 5ad07da..8f4f1e3 100755
--- a/setup.py
+++ b/setup.py
@@ -43,8 +43,8 @@ def fread(fname):
     ],
 
     install_requires=[
-        'Django == 1.5.1',
-        'django-registration',
+        'Django',
+        'django-registration-redux',
         'setuptools',
         'pkginfo',
         'docutils',

From 62023f318e6a297fd0443262b14fc29bd7601357 Mon Sep 17 00:00:00 2001
From: Ed Crewe <edmundcrewe@gmail.com>
Date: Tue, 11 Aug 2015 16:44:37 +0100
Subject: [PATCH 2/4] remove 1.6 transaction decorator and fix logging

---
 djangopypi2/apps/pypi_frontend/distutils_views.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/djangopypi2/apps/pypi_frontend/distutils_views.py b/djangopypi2/apps/pypi_frontend/distutils_views.py
index b914e70..c0f7fa2 100644
--- a/djangopypi2/apps/pypi_frontend/distutils_views.py
+++ b/djangopypi2/apps/pypi_frontend/distutils_views.py
@@ -1,7 +1,7 @@
 import os
 import re
 import itertools
-from logging import getLogger
+import logging as log
 from django.conf import settings
 from django.db import transaction
 from django.http import *
@@ -17,8 +17,6 @@
 from ..pypi_packages.models import Distribution
 from .basic_auth import basic_auth
 
-log = getLogger(__name__)
-
 class BadRequest(Exception):
     pass
 
@@ -26,7 +24,6 @@ class Forbidden(Exception):
     pass
 
 @basic_auth
-@transaction.commit_manually
 def register_or_upload(request):
     try:
         _verify_post_request(request)

From e80e922bb27baa9ac03efad29044dabe9b51d5fd Mon Sep 17 00:00:00 2001
From: Ed Crewe <edmundcrewe@gmail.com>
Date: Tue, 11 Aug 2015 16:45:07 +0100
Subject: [PATCH 3/4] quick fix of users link

---
 djangopypi2/apps/pypi_users/templates/pypi_users/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djangopypi2/apps/pypi_users/templates/pypi_users/index.html b/djangopypi2/apps/pypi_users/templates/pypi_users/index.html
index 49c63e0..400e0e3 100644
--- a/djangopypi2/apps/pypi_users/templates/pypi_users/index.html
+++ b/djangopypi2/apps/pypi_users/templates/pypi_users/index.html
@@ -14,7 +14,7 @@ <h1>Users</h1>
     {% for user in users %}
     <tr>
       <td>
-        <a href="{{ user.get_absolute_url }}">{{ user.username }}</a>
+        <a href="/users/{{ user.username }}">{{ user.username }}</a>
       </td>
       <td>{{ user.packages_owned.count }}</td>
       <td>{{ user.date_joined|timesince }}</td>

From 89fb84803e08ceeff0ed9a4e1fa58caffdfe00df Mon Sep 17 00:00:00 2001
From: Ed Crewe <edmundcrewe@gmail.com>
Date: Tue, 11 Aug 2015 16:48:01 +0100
Subject: [PATCH 4/4] up version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b616048..844f6a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.2
+0.6.3