Django 1.5 - DO NOT MERGE #135
Conversation
{% url view_name %} --> {% url 'view_name' %}
https://docs.djangoproject.com/en/1.5/releases/1.5/ (Overview Notes)
This commit requires following 1. django-haystack==2.1.0 2. xapian-haystack==2.0.0 3. xapian-python-bindings-for-python-2.7.0==1.2.8 4. Whoosh==2.5.1 This code is NOT backward compatible with older versions of django-haystack, xapian-haystack Kindly install xapian-haystack from its repository and NOT with `pip` https://github.com/notanumber/xapian-haystack/ (master)
Changes: 1. move built-in registration.backends.default.urls into person.urls (from scipy_central.urls to scipy_central.person.urls) 2. django-registration latest version NOT compatible with previous versions. Its majorly written from scratch using class-based `views` (registration.backends.default.views.RegistrationView) 3. SciPyRegistrationBackend() is inherited from class-based view [2] and moved into views.py required packages: django-registration==1.0
django.conf.urls.defaults import * --> django.conf.urls import *
|
@ksurya I think you included a lot of changes, that although probably necessary, are not at all related to Django 1.5. Why don't you create more PRs, each with their commits, neatly separated? |
|
I was thinking Since each of the individual bug-fixing or improving code are quite small and confined to upgrading the packages and fixing relevant code, I added them in the same branch. Moreover, I discovered them when I started reading django-docs and other respective docs. |
|
No, django-1.5 is updating the code to work correctly with Django-1.5. Remove all commits that are not part of that, and create a PR for each one of them so it can be decided separately if they are needed and when to merge. |
|
Problems:
I will look at the code now. |
|
yeah, you can't upload images. This is fixed in #141 PR |
deploy/wsgi.py
Outdated
| might make sense to replace the whole Django WSGI application with a custom one | ||
| that later delegates to the Django one. For example, you could introduce WSGI | ||
| middleware here, or combine a Django application with an application of another | ||
| framework. |
There was a problem hiding this comment.
Remove this previous paragraph, it's not needed.
|
Also, there are conflicts between this PR and master, which means it can't be automatically merged. Fix them. |
|
@lomegor I have found why you were getting server error on search query.
As |
1. deploy/wsgi.py
from django.template.defaultfilters import slugify --> from django.utils.text import slugify change string type to unicode in tests
`execute_manager` is deprecated -- mentioned in django-1.4 release notes update manage.py according to django-1.5
admin_media_prefix is deprecated in django-1.4 Its used from static_url
Django 1.5 deprecates AUTH_PROFILE_MODULE settings which enable to extend User model. scipy central UserProfile fields are not used in User authentication or Registration! So, a OneToField with User module fits our requirement. It is described at https://docs.djangoproject.com/en/1.5/topics/auth/customizing/#extending-the-existing-user-model The following are the changes done: 1. remove AUTH_PROFILE_MODULE variable in settings 2. Improve UserProfile admin interface 3. change `User` model import
The below are the changes made (some minor changes might have been missed but can be found clearly in commit messages)
{% url %}template tagsearch_settings.pyandsearch_indexes.pyregistration.backends.default.urlsfromscipy_central.urlstoscipy_central.person.urlspages.views.page_404_errordefault 404 handlerslugifyimport, upgrade url conf import[5] Django transaction middleware raises #132
Note: A deprecation warning is observed when starting the server regarding
hashlibimport. This is caused in django transactions middleware (It will be deprecated in 1.7. However, we require it at the moment until we have our own Middleware)