Skip to content

make it work with latest django 1.8 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.2
0.6.3
5 changes: 1 addition & 4 deletions djangopypi2/apps/pypi_frontend/distutils_views.py
Original file line number Diff line number Diff line change
@@ -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,16 +17,13 @@
from ..pypi_packages.models import Distribution
from .basic_auth import basic_auth

log = getLogger(__name__)

class BadRequest(Exception):
pass

class Forbidden(Exception):
pass

@basic_auth
@transaction.commit_manually
def register_or_upload(request):
try:
_verify_post_request(request)
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions djangopypi2/website/settings.py
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -43,8 +43,8 @@ def fread(fname):
],

install_requires=[
'Django == 1.5.1',
'django-registration',
'Django',
'django-registration-redux',
'setuptools',
'pkginfo',
'docutils',