diff --git a/VERSION b/VERSION index b616048..844f6a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.2 +0.6.3 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) 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 @@

Users

{% for user in users %} - {{ user.username }} + {{ user.username }} {{ user.packages_owned.count }} {{ user.date_joined|timesince }} 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',