Skip to content

Commit

Permalink
5.0.0-dev: Only support Django 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
dcramer committed Sep 3, 2012
1 parent 19ea54f commit b4cea76
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 41 deletions.
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -51,7 +51,7 @@
'django-celery>=2.5.5',
'celery>=2.5.3',
'django-crispy-forms>=1.1.4',
'Django>=1.2,<1.5',
'Django>=1.4.1,<=1.5',
'django-indexer>=0.3.0',
'django-paging>=0.2.4',
'django-picklefield>=0.2.0',
Expand All @@ -70,7 +70,7 @@

setup(
name='sentry',
version='4.10.0',
version='5.0.0-dev',
author='David Cramer',
author_email='dcramer@gmail.com',
url='http://www.getsentry.com',
Expand Down
22 changes: 12 additions & 10 deletions src/sentry/models.py
Expand Up @@ -13,6 +13,7 @@
import time
import uuid
import urlparse

from datetime import datetime
from hashlib import md5
from indexer.models import BaseIndex
Expand All @@ -27,6 +28,7 @@
from django.template.defaultfilters import slugify
from django.utils.datastructures import SortedDict
from django.utils.encoding import smart_unicode
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _

from sentry.conf import settings
Expand Down Expand Up @@ -110,7 +112,7 @@ class TeamMember(Model):
user = models.ForeignKey(User, related_name="sentry_teammember_set")
is_active = models.BooleanField(default=True)
type = models.IntegerField(choices=MEMBER_TYPES, default=globals().get(settings.DEFAULT_PROJECT_ACCESS))
date_added = models.DateTimeField(default=datetime.now)
date_added = models.DateTimeField(default=now)

objects = BaseManager()

Expand All @@ -134,7 +136,7 @@ class Project(Model):
owner = models.ForeignKey(User, related_name="sentry_owned_project_set", null=True)
team = models.ForeignKey(Team, null=True)
public = models.BooleanField(default=settings.ALLOW_PUBLIC_PROJECTS)
date_added = models.DateTimeField(default=datetime.now)
date_added = models.DateTimeField(default=now)
status = models.PositiveIntegerField(default=0, choices=(
(0, 'Visible'),
(1, 'Hidden'),
Expand Down Expand Up @@ -287,7 +289,7 @@ class PendingTeamMember(Model):
team = models.ForeignKey(Team, related_name="pending_member_set")
email = models.EmailField()
type = models.IntegerField(choices=MEMBER_TYPES, default=globals().get(settings.DEFAULT_PROJECT_ACCESS))
date_added = models.DateTimeField(default=datetime.now)
date_added = models.DateTimeField(default=now)

objects = BaseManager()

Expand Down Expand Up @@ -389,8 +391,8 @@ class Group(MessageBase):
"""
status = models.PositiveIntegerField(default=0, choices=STATUS_LEVELS, db_index=True)
times_seen = models.PositiveIntegerField(default=1, db_index=True)
last_seen = models.DateTimeField(default=datetime.now, db_index=True)
first_seen = models.DateTimeField(default=datetime.now, db_index=True)
last_seen = models.DateTimeField(default=now, db_index=True)
first_seen = models.DateTimeField(default=now, db_index=True)
resolved_at = models.DateTimeField(null=True, db_index=True)
# active_at should be the same as first_seen by default
active_at = models.DateTimeField(null=True, db_index=True)
Expand Down Expand Up @@ -480,7 +482,7 @@ class Event(MessageBase):
"""
group = models.ForeignKey(Group, blank=True, null=True, related_name="event_set")
event_id = models.CharField(max_length=32, null=True, db_column="message_id")
datetime = models.DateTimeField(default=datetime.now, db_index=True)
datetime = models.DateTimeField(default=now, db_index=True)
time_spent = models.FloatField(null=True)
server_name = models.CharField(max_length=128, db_index=True, null=True)
site = models.CharField(max_length=128, db_index=True, null=True)
Expand Down Expand Up @@ -625,8 +627,8 @@ class MessageFilterValue(Model):
times_seen = models.PositiveIntegerField(default=0)
key = models.CharField(choices=FILTER_KEYS, max_length=32)
value = models.CharField(max_length=200)
last_seen = models.DateTimeField(default=datetime.now, db_index=True, null=True)
first_seen = models.DateTimeField(default=datetime.now, db_index=True, null=True)
last_seen = models.DateTimeField(default=now, db_index=True, null=True)
first_seen = models.DateTimeField(default=now, db_index=True, null=True)

objects = BaseManager()

Expand Down Expand Up @@ -690,8 +692,8 @@ class SearchDocument(Model):
group = models.ForeignKey(Group)
total_events = models.PositiveIntegerField(default=1)
status = models.PositiveIntegerField(default=0)
date_added = models.DateTimeField(default=datetime.now)
date_changed = models.DateTimeField(default=datetime.now)
date_added = models.DateTimeField(default=now)
date_changed = models.DateTimeField(default=now)

objects = SearchDocumentManager()

Expand Down
27 changes: 0 additions & 27 deletions src/sentry/utils/compat/db.py

This file was deleted.

3 changes: 1 addition & 2 deletions tests/base.py
Expand Up @@ -7,14 +7,13 @@
from sentry.utils import json
from sentry.utils.auth import get_signature, get_auth_header
from sentry.utils.compat import pickle
from sentry.utils.compat.db import connections


from django.conf import settings as django_settings
from django.core.cache import cache
from django.core.management import call_command
from django.core.urlresolvers import reverse
from django.db import DEFAULT_DB_ALIAS
from django.db import connections, DEFAULT_DB_ALIAS
from django.test import TestCase, TransactionTestCase
from django.test.client import Client

Expand Down

0 comments on commit b4cea76

Please sign in to comment.