From 5892538fb7b6363b585eb7c5ffc52dfaae73ccef Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 23 Apr 2012 23:56:55 +0100 Subject: [PATCH] Basic upgrade to all base packages, Django, Celery and others. --- app/api/admin.py | 3 --- app/conf/common.py | 1 - app/eve_api/tasks/account.py | 2 +- app/eve_api/tasks/alliance.py | 2 +- app/eve_api/tasks/character.py | 2 +- app/eve_api/tasks/corporation.py | 14 ++++++------- app/eve_api/tasks/static.py | 3 ++- app/eve_proxy/models.py | 1 + app/eve_proxy/tasks.py | 4 +++- app/groups/urls.py | 4 ++-- app/hr/tasks.py | 4 +++- app/reddit/tasks.py | 3 +-- app/sso/tasks.py | 2 +- app/sso/urls.py | 4 ++-- requirements.txt | 35 +++++++++++++++++--------------- 15 files changed, 44 insertions(+), 40 deletions(-) diff --git a/app/api/admin.py b/app/api/admin.py index cde57ba..5ec9e8c 100644 --- a/app/api/admin.py +++ b/app/api/admin.py @@ -1,6 +1,5 @@ from django.contrib import admin from api.models import AuthAPIKey, AuthAPILog -from piston.models import Consumer, Token class AuthAPIKeyAdmin(admin.ModelAdmin): list_display = ('key', 'name', 'url', 'active') @@ -18,5 +17,3 @@ class AuthAPILogAdmin(admin.ModelAdmin): admin.site.register(AuthAPIKey, AuthAPIKeyAdmin) admin.site.register(AuthAPILog, AuthAPILogAdmin) -admin.site.register(Consumer, admin.ModelAdmin) -admin.site.register(Token, admin.ModelAdmin) diff --git a/app/conf/common.py b/app/conf/common.py index 47f20f4..4614235 100644 --- a/app/conf/common.py +++ b/app/conf/common.py @@ -14,7 +14,6 @@ USE_I18N = True # Defines the Static Media storage as per staticfiles contrib STATIC_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'static') STATIC_URL = '/static/' -ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' # Make this unique, and don't share it with anybody. SECRET_KEY = '' diff --git a/app/eve_api/tasks/account.py b/app/eve_api/tasks/account.py index 526748b..473c840 100644 --- a/app/eve_api/tasks/account.py +++ b/app/eve_api/tasks/account.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from xml.dom import minidom import logging -from celery.decorators import task +from celery.task import task from celery.task.sets import TaskSet from gargoyle import gargoyle diff --git a/app/eve_api/tasks/alliance.py b/app/eve_api/tasks/alliance.py index 58835e5..f1dfc85 100644 --- a/app/eve_api/tasks/alliance.py +++ b/app/eve_api/tasks/alliance.py @@ -1,7 +1,7 @@ from datetime import datetime from xml.dom import minidom -from celery.decorators import task +from celery.task import task from eve_proxy.models import CachedDocument from eve_proxy.exceptions import DocumentRetrievalError diff --git a/app/eve_api/tasks/character.py b/app/eve_api/tasks/character.py index 50c2ede..1117146 100644 --- a/app/eve_api/tasks/character.py +++ b/app/eve_api/tasks/character.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta from xml.dom import minidom import logging -from celery.decorators import task +from celery.task import task from celery.task.sets import subtask from gargoyle import gargoyle diff --git a/app/eve_api/tasks/corporation.py b/app/eve_api/tasks/corporation.py index 934d73d..e6bc045 100644 --- a/app/eve_api/tasks/corporation.py +++ b/app/eve_api/tasks/corporation.py @@ -3,7 +3,7 @@ import logging from datetime import datetime, timedelta from xml.dom import minidom -from celery.decorators import task +from celery.task import task from gargoyle import gargoyle from eve_proxy.models import CachedDocument @@ -98,14 +98,12 @@ def import_corp_details_func(corp_id, log=logging.getLogger(__name__)): if int(d['allianceID']): corpobj.alliance, created = EVEPlayerAlliance.objects.get_or_create(id=d['allianceID']) + corpobj.api_last_updated = datetime.utcnow() + corpobj.save() + # Skip looking up the CEOs for NPC corps and ones with no CEO defined (dead corps) if corp_id > 1000182 and int(d['ceoID']) > 1: import_eve_character.delay(d['ceoID'], callback=link_ceo.subtask(corporation=corpobj.id)) - else: - corpobj.ceo_character = None - - corpobj.api_last_updated = datetime.utcnow() - corpobj.save() return EVEPlayerCorporation.objects.get(pk=corpobj.pk) @@ -113,7 +111,9 @@ def import_corp_details_func(corp_id, log=logging.getLogger(__name__)): @task(ignore_result=True) def link_ceo(corporation, character): """ Links a character to the CEO position of a corporation """ - corpobj = EVEPlayerCorporation.objects.filter(id=corporation).update(ceo_character=EVEPlayerCharacter.objects.get(id=character)) + corp = EVEPlayerCorporation.objects.filter(id=corporation) + char = EVEPlayerCharacter.objects.get(id=character) + corp.update(ceo_character=char) @task(ignore_result=True) diff --git a/app/eve_api/tasks/static.py b/app/eve_api/tasks/static.py index ffc9ef6..f778f93 100644 --- a/app/eve_api/tasks/static.py +++ b/app/eve_api/tasks/static.py @@ -1,4 +1,5 @@ -from celery.decorators import task +from celery.task import task + from eve_proxy.models import CachedDocument from eve_api.utils import basic_xml_parse_doc from eve_api.models import EVESkill, EVESkillGroup diff --git a/app/eve_proxy/models.py b/app/eve_proxy/models.py index 482c25c..394e734 100644 --- a/app/eve_proxy/models.py +++ b/app/eve_proxy/models.py @@ -70,6 +70,7 @@ class CachedDocumentManager(models.Manager): logger.debug('Requesting URL: %s' % url) try: + print doc_key doc = super(CachedDocumentManager, self).get_query_set().get(pk=doc_key) created = False except self.model.DoesNotExist: diff --git a/app/eve_proxy/tasks.py b/app/eve_proxy/tasks.py index 5792da7..65a46ca 100644 --- a/app/eve_proxy/tasks.py +++ b/app/eve_proxy/tasks.py @@ -1,7 +1,9 @@ from django.conf import settings import logging from datetime import datetime, timedelta -from celery.decorators import task + +from celery.task import task + from eve_proxy.models import CachedDocument, ApiAccessLog @task(ignore_result=True) diff --git a/app/groups/urls.py b/app/groups/urls.py index 02bfb3f..c88c49e 100644 --- a/app/groups/urls.py +++ b/app/groups/urls.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import * -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse_lazy from groups import views urlpatterns = patterns('', @@ -14,5 +14,5 @@ urlpatterns = patterns('', ) urlpatterns += patterns('django.views.generic.simple', - ('^$', 'redirect_to', {'url': reverse('groups.views.group_list')}), + ('^$', 'redirect_to', {'url': reverse_lazy('groups.views.group_list')}), ) diff --git a/app/hr/tasks.py b/app/hr/tasks.py index 8109c96..a0a8467 100644 --- a/app/hr/tasks.py +++ b/app/hr/tasks.py @@ -1,7 +1,9 @@ from django.conf import settings import logging from datetime import datetime, timedelta -from celery.decorators import task + +from celery.task import task + from hr.utils import blacklist_values from django.contrib.auth.models import User from django.core.mail import send_mail diff --git a/app/reddit/tasks.py b/app/reddit/tasks.py index 7910ea5..eb73ba1 100644 --- a/app/reddit/tasks.py +++ b/app/reddit/tasks.py @@ -1,7 +1,6 @@ from datetime import datetime, timedelta from urllib2 import HTTPError, URLError -from celery.task import Task -from celery.decorators import task +from celery.task import Task, task from reddit.models import RedditAccount from reddit.api import Inbox, LoginError, Flair from django.conf import settings diff --git a/app/sso/tasks.py b/app/sso/tasks.py index 7af87ab..5945f69 100644 --- a/app/sso/tasks.py +++ b/app/sso/tasks.py @@ -10,7 +10,7 @@ from django.utils import simplejson as json from django.contrib.auth.models import User from celery.signals import task_failure -from celery.decorators import task +from celery.task import task from api.models import AuthAPIKey from eve_api.models import EVEAccount, EVEPlayerCorporation, EVEPlayerAlliance diff --git a/app/sso/urls.py b/app/sso/urls.py index bdacf9d..dbb668a 100644 --- a/app/sso/urls.py +++ b/app/sso/urls.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import * -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse, reverse_lazy from django.contrib.auth.views import password_change, password_change_done from django.contrib.auth.decorators import login_required @@ -28,5 +28,5 @@ urlpatterns = patterns('', ) urlpatterns += patterns('django.views.generic.simple', - ('^$', 'redirect_to', {'url': reverse('sso.views.profile')}), + ('^$', 'redirect_to', {'url': reverse_lazy('sso.views.profile')}), ) diff --git a/requirements.txt b/requirements.txt index acea387..d253df1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,24 @@ -MySQL-python -Django==1.3 --e hg+https://bitbucket.org/jespern/django-piston@c4b2d21db51a#egg=django_piston --e hg+https://bitbucket.org/ubernostrum/django-registration@d36a38202ee3#egg=django-registration -yolk==0.4.1 --e hg+http://bitbucket.org/schinckel/django-jsonfield#egg=django-jsonfield xmlrpclib==1.0.1 -South==0.7.3 -fabric -flup -celery==2.2.6 -django-celery==2.2.4 xmpppy -django-sentry==1.13.5 -raven==0.7.0 -nexus --e git+https://github.com/nikdoof/gargoyle.git@dca57fc4b437b85f8cbc#egg=gargoyle +dnspython beautifulsoup +fabric + +Django==1.4 +MySQL-python +Celery==2.5.3 +django-celery==2.5.5 + +-e hg+http://bitbucket.org/schinckel/django-jsonfield#egg=django-jsonfield +South==0.7.3 django-redis-cache IPy==0.75 -dnspython + +sentry==4.0.15 +raven==1.7.3 + +nexus +gargoyle==0.8.0 +-e hg+https://bitbucket.org/jespern/django-piston@7c90898072ce#egg=django_piston +-e hg+https://bitbucket.org/ubernostrum/django-registration@27bccd108cde#egg=django-registration +