Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move apps outside of the django_website package.

  • Loading branch information...
commit 4bdbb80a8f6de3b85c31fdbb9aaa0d2747a83d5a 1 parent f379356
@aaugustin aaugustin authored
Showing with 37 additions and 27 deletions.
  1. +2 −0  TODO
  2. 0  {django_website/trac/migrations → accounts}/__init__.py
  3. 0  {django_website → }/accounts/forms.py
  4. 0  {django_website → }/accounts/migrations/0001_initial.py
  5. 0  {django_website/trac → accounts/migrations}/__init__.py
  6. 0  {django_website → }/accounts/models.py
  7. 0  {django_website → }/accounts/profile_urls.py
  8. 0  {django_website → }/accounts/urls.py
  9. +4 −2 {django_website → }/accounts/views.py
  10. 0  {django_website/svntogit → aggregator}/__init__.py
  11. 0  {django_website → }/aggregator/admin.py
  12. 0  {django_website → }/aggregator/feeds.py
  13. 0  {django_website → }/aggregator/forms.py
  14. 0  {django_website/legacy → aggregator/management}/__init__.py
  15. 0  {django_website/docs/templatetags → aggregator/management/commands}/__init__.py
  16. 0  {django_website → }/aggregator/management/commands/send_pending_approval_email.py
  17. 0  {django_website → }/aggregator/migrations/0001_initial.py
  18. 0  {django_website → }/aggregator/migrations/0002_rename_tables.py
  19. 0  {django_website → }/aggregator/migrations/0003_add_feed_owner.py
  20. 0  {django_website → }/aggregator/migrations/0004_add_approval_status_field.py
  21. 0  {django_website → }/aggregator/migrations/0005_add_feed_approver_auth_group.py
  22. 0  {django_website/docs → aggregator}/migrations/__init__.py
  23. 0  {django_website → }/aggregator/models.py
  24. 0  {django_website/docs/management/commands → aggregator/templatetags}/__init__.py
  25. 0  {django_website → }/aggregator/templatetags/aggregator.py
  26. +3 −1 {django_website → }/aggregator/tests.py
  27. 0  {django_website → }/aggregator/urls.py
  28. 0  {django_website → }/aggregator/utils.py
  29. +3 −1 {django_website → }/aggregator/views.py
  30. 0  {django_website/docs/management → blog}/__init__.py
  31. 0  {django_website → }/blog/admin.py
  32. 0  {django_website → }/blog/feeds.py
  33. 0  {django_website → }/blog/migrations/0001_initial.py
  34. 0  {django_website → }/blog/migrations/0002_auto__add_field_entry_is_active.py
  35. 0  {django_website → }/blog/migrations/0003_activate_existing_entries.py
  36. 0  {django_website → }/blog/migrations/0004_auto__add_field_entry_summary_html__add_field_entry_body_html.py
  37. 0  {django_website → }/blog/migrations/0005_copy_entry_summary_and_body_to_html.py
  38. 0  {django_website → }/blog/migrations/0006_auto__add_field_entry_use_raw_html.py
  39. 0  {django_website → }/blog/migrations/0007_existing_entries_are_raw_html.py
  40. 0  {django_website → }/blog/migrations/0008_auto__del_field_entry_use_raw_html.py
  41. 0  {django_website → }/blog/migrations/0009_auto__add_field_entry_content_format.py
  42. 0  {django_website/docs → blog/migrations}/__init__.py
  43. 0  {django_website → }/blog/models.py
  44. 0  {django_website/contact → blog/templatetags}/__init__.py
  45. 0  {django_website → }/blog/templatetags/weblog.py
  46. 0  {django_website → }/blog/urls.py
  47. 0  {django_website → }/blog/views.py
  48. 0  {django_website/cla/migrations → cla}/__init__.py
  49. 0  {django_website → }/cla/admin.py
  50. 0  {django_website → }/cla/migrations/0001_initial.py
  51. 0  {django_website/cla → cla/migrations}/__init__.py
  52. 0  {django_website → }/cla/models.py
  53. 0  {django_website/blog/templatetags → contact}/__init__.py
  54. 0  {django_website → }/contact/forms.py
  55. 0  {django_website/svntogit → contact}/models.py
  56. 0  {django_website → }/contact/urls.py
  57. +2 −2 django_docs/settings.py
  58. +1 −1  django_docs/urls.py
  59. +1 −1  django_website/context_processors.py
  60. +2 −1  django_website/sitemaps.py
  61. +9 −9 django_www/settings.py
  62. +10 −9 django_www/urls.py
  63. 0  {django_website/blog/migrations → docs}/__init__.py
  64. 0  {django_website → }/docs/admin.py
  65. 0  {django_website → }/docs/fixtures/doc_releases.json
  66. 0  {django_website → }/docs/forms.py
  67. 0  {django_website/blog → docs/management}/__init__.py
  68. 0  {django_website/aggregator/templatetags → docs/management/commands}/__init__.py
  69. 0  {django_website → }/docs/management/commands/update_docs.py
  70. 0  {django_website → }/docs/migrations/0001_initial.py
  71. 0  {django_website → }/docs/migrations/0002_add_document_model.py
  72. 0  {django_website → }/docs/migrations/0003_fix_document_model.py
  73. 0  {django_website → }/docs/migrations/0004_add_git_support.py
  74. 0  {django_website/aggregator → docs}/migrations/__init__.py
  75. 0  {django_website → }/docs/models.py
  76. 0  {django_website → }/docs/search_indexes.py
  77. 0  {django_website → }/docs/search_sites.py
  78. 0  {django_website → }/docs/templates/docs/doc.html
  79. 0  {django_website → }/docs/templates/docs/genindex.html
  80. 0  {django_website → }/docs/templates/docs/index.html
  81. 0  {django_website → }/docs/templates/docs/py-modindex.html
  82. 0  {django_website → }/docs/templates/docs/search.html
  83. 0  {django_website → }/docs/templates/docs/search_form.html
  84. 0  {django_website/aggregator/management/commands → docs/templatetags}/__init__.py
  85. 0  {django_website → }/docs/templatetags/docs.py
  86. 0  {django_website → }/docs/utils.py
  87. 0  {django_website → }/docs/views.py
  88. 0  {django_website/aggregator/management → legacy}/__init__.py
  89. 0  django_website/aggregator/__init__.py → legacy/models.py
  90. 0  {django_website → }/legacy/urls.py
  91. 0  {django_website → }/legacy/views.py
  92. 0  {django_website/accounts/migrations → svntogit}/__init__.py
  93. 0  {django_website → }/svntogit/mapping.py
  94. 0  django_website/accounts/__init__.py → svntogit/models.py
  95. 0  {django_website → }/svntogit/urls.py
  96. 0  {django_website → }/svntogit/views.py
  97. 0  tracdb/__init__.py
  98. 0  {django_website/trac → tracdb}/db_router.py
  99. 0  {django_website/trac → tracdb}/migrations/0001_initial.py
  100. 0  tracdb/migrations/__init__.py
  101. 0  {django_website/trac → tracdb}/models.py
  102. 0  {django_website/trac → tracdb}/stats.py
  103. 0  {django_website/trac → tracdb}/trac.sql
View
2  TODO
@@ -1,2 +1,4 @@
* allow users to "claim" legacy feeds (might do this by hand.)
* get rid of wsgi-scripts, move useful functions to django_*.wsgi
+* the aggregator templatetags are dead code and have an import error
+* remove django_website.shortcuts
View
0  django_website/trac/migrations/__init__.py → accounts/__init__.py
File renamed without changes
View
0  django_website/accounts/forms.py → accounts/forms.py
File renamed without changes
View
0  ...bsite/accounts/migrations/0001_initial.py → accounts/migrations/0001_initial.py
File renamed without changes
View
0  django_website/trac/__init__.py → accounts/migrations/__init__.py
File renamed without changes
View
0  django_website/accounts/models.py → accounts/models.py
File renamed without changes
View
0  django_website/accounts/profile_urls.py → accounts/profile_urls.py
File renamed without changes
View
0  django_website/accounts/urls.py → accounts/urls.py
File renamed without changes
View
6 django_website/accounts/views.py → accounts/views.py
@@ -8,10 +8,12 @@
from django.conf import settings
from django.core import cache
from django.http import HttpResponse
+
+from cla.models import find_agreements
+from tracdb import stats as trac_stats
+
from .forms import ProfileForm
from .models import Profile
-from ..trac import stats as trac_stats
-from ..cla.models import find_agreements
def user_profile(request, username):
u = get_object_or_404(User, username=username)
View
0  django_website/svntogit/__init__.py → aggregator/__init__.py
File renamed without changes
View
0  django_website/aggregator/admin.py → aggregator/admin.py
File renamed without changes
View
0  django_website/aggregator/feeds.py → aggregator/feeds.py
File renamed without changes
View
0  django_website/aggregator/forms.py → aggregator/forms.py
File renamed without changes
View
0  django_website/legacy/__init__.py → aggregator/management/__init__.py
File renamed without changes
View
0  django_website/docs/templatetags/__init__.py → aggregator/management/commands/__init__.py
File renamed without changes
View
0  ...t/commands/send_pending_approval_email.py → ...t/commands/send_pending_approval_email.py
File renamed without changes
View
0  ...ite/aggregator/migrations/0001_initial.py → aggregator/migrations/0001_initial.py
File renamed without changes
View
0  ...gregator/migrations/0002_rename_tables.py → aggregator/migrations/0002_rename_tables.py
File renamed without changes
View
0  ...regator/migrations/0003_add_feed_owner.py → aggregator/migrations/0003_add_feed_owner.py
File renamed without changes
View
0  ...rations/0004_add_approval_status_field.py → ...rations/0004_add_approval_status_field.py
File renamed without changes
View
0  ...ions/0005_add_feed_approver_auth_group.py → ...ions/0005_add_feed_approver_auth_group.py
File renamed without changes
View
0  django_website/docs/migrations/__init__.py → aggregator/migrations/__init__.py
File renamed without changes
View
0  django_website/aggregator/models.py → aggregator/models.py
File renamed without changes
View
0  ...site/docs/management/commands/__init__.py → aggregator/templatetags/__init__.py
File renamed without changes
View
0  ...ite/aggregator/templatetags/aggregator.py → aggregator/templatetags/aggregator.py
File renamed without changes
View
4 django_website/aggregator/tests.py → aggregator/tests.py
@@ -9,9 +9,11 @@
from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test.client import Client
+
+from docs.models import DocumentRelease
+
from .management.commands import send_pending_approval_email
from . import models
-from ..docs.models import DocumentRelease
class AggregatorTests(TestCase):
View
0  django_website/aggregator/urls.py → aggregator/urls.py
File renamed without changes
View
0  django_website/aggregator/utils.py → aggregator/utils.py
File renamed without changes
View
4 django_website/aggregator/views.py → aggregator/views.py
@@ -8,9 +8,11 @@
from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse
from django.views.generic.list_detail import object_list
+
+from django_website.shortcuts import render
+
from .models import FeedItem, Feed, FeedType, APPROVED_FEED
from .forms import FeedModelForm
-from ..shortcuts import render
def index(request):
"""
View
0  django_website/docs/management/__init__.py → blog/__init__.py
File renamed without changes
View
0  django_website/blog/admin.py → blog/admin.py
File renamed without changes
View
0  django_website/blog/feeds.py → blog/feeds.py
File renamed without changes
View
0  ...o_website/blog/migrations/0001_initial.py → blog/migrations/0001_initial.py
File renamed without changes
View
0  ...s/0002_auto__add_field_entry_is_active.py → ...s/0002_auto__add_field_entry_is_active.py
File renamed without changes
View
0  ...rations/0003_activate_existing_entries.py → ...rations/0003_activate_existing_entries.py
File renamed without changes
View
0  ...ummary_html__add_field_entry_body_html.py → ...ummary_html__add_field_entry_body_html.py
File renamed without changes
View
0  ...05_copy_entry_summary_and_body_to_html.py → ...05_copy_entry_summary_and_body_to_html.py
File renamed without changes
View
0  ...006_auto__add_field_entry_use_raw_html.py → ...006_auto__add_field_entry_use_raw_html.py
File renamed without changes
View
0  ...ons/0007_existing_entries_are_raw_html.py → ...ons/0007_existing_entries_are_raw_html.py
File renamed without changes
View
0  ...008_auto__del_field_entry_use_raw_html.py → ...008_auto__del_field_entry_use_raw_html.py
File renamed without changes
View
0  ...9_auto__add_field_entry_content_format.py → ...9_auto__add_field_entry_content_format.py
File renamed without changes
View
0  django_website/docs/__init__.py → blog/migrations/__init__.py
File renamed without changes
View
0  django_website/blog/models.py → blog/models.py
File renamed without changes
View
0  django_website/contact/__init__.py → blog/templatetags/__init__.py
File renamed without changes
View
0  django_website/blog/templatetags/weblog.py → blog/templatetags/weblog.py
File renamed without changes
View
0  django_website/blog/urls.py → blog/urls.py
File renamed without changes
View
0  django_website/blog/views.py → blog/views.py
File renamed without changes
View
0  django_website/cla/migrations/__init__.py → cla/__init__.py
File renamed without changes
View
0  django_website/cla/admin.py → cla/admin.py
File renamed without changes
View
0  ...go_website/cla/migrations/0001_initial.py → cla/migrations/0001_initial.py
File renamed without changes
View
0  django_website/cla/__init__.py → cla/migrations/__init__.py
File renamed without changes
View
0  django_website/cla/models.py → cla/models.py
File renamed without changes
View
0  django_website/blog/templatetags/__init__.py → contact/__init__.py
File renamed without changes
View
0  django_website/contact/forms.py → contact/forms.py
File renamed without changes
View
0  django_website/svntogit/models.py → contact/models.py
File renamed without changes
View
0  django_website/contact/urls.py → contact/urls.py
File renamed without changes
View
4 django_docs/settings.py
@@ -10,7 +10,7 @@
# Keep around debug_toolbar and raven if the parent settings module installed
# them.
_new_apps = [
- 'django_website.docs',
+ 'docs',
'haystack',
]
if 'debug_toolbar' in INSTALLED_APPS:
@@ -26,7 +26,7 @@
DOCS_BUILD_ROOT = '/tmp/djangodocs'
# Haystack settings
-HAYSTACK_SITECONF = 'django_website.docs.search_sites'
+HAYSTACK_SITECONF = 'docs.search_sites'
if PRODUCTION:
HAYSTACK_SEARCH_ENGINE = 'xapian'
HAYSTACK_XAPIAN_PATH = BASE.ancestor(2).child('djangodocs.index')
View
2  django_docs/urls.py
@@ -2,7 +2,7 @@
from django.conf.urls.defaults import *
from haystack.views import search_view_factory
-from django_website.docs import views
+from docs import views
urlpatterns = patterns('',
url(
View
2  django_website/context_processors.py
@@ -1,7 +1,7 @@
from django.conf import settings
from django.core.cache import cache
-from django_website.docs.models import DocumentRelease
+from docs.models import DocumentRelease
def recent_release(request):
recent_release = cache.get('recent_release')
View
3  django_website/sitemaps.py
@@ -3,7 +3,8 @@
import datetime
from django.contrib.sitemaps import Sitemap
from django.contrib.flatpages.models import FlatPage
-from .blog.models import Entry
+
+from blog.models import Entry
class FlatPageSitemap(Sitemap):
"""
View
18 django_www/settings.py
@@ -35,7 +35,7 @@
'USER': 'code.djangoproject'
}
}
-DATABASE_ROUTERS = ['django_website.trac.db_router.TracRouter']
+DATABASE_ROUTERS = ['tracdb.db_router.TracRouter']
USE_I18N = False
USE_L10N = False
@@ -72,13 +72,13 @@
'django.contrib.sessions',
'django.contrib.sitemaps',
'django_push.subscriber',
- 'django_website.blog',
- 'django_website.accounts',
- 'django_website.aggregator',
- 'django_website.cla',
- 'django_website.docs',
- 'django_website.svntogit',
- 'django_website.trac',
+ 'blog',
+ 'accounts',
+ 'aggregator',
+ 'cla',
+ 'docs',
+ 'svntogit',
+ 'tracdb',
'registration',
'south',
'djangosecure',
@@ -179,7 +179,7 @@
# PubSubHubbub settings
PUSH_HUB = 'https://superfeedr.com/hubbub'
-PUSH_CREDENTIALS = 'django_website.aggregator.utils.push_credentials'
+PUSH_CREDENTIALS = 'aggregator.utils.push_credentials'
PUSH_SSL_CALLBACK = PRODUCTION
# Lock down some security stuff
View
19 django_www/urls.py
@@ -9,9 +9,10 @@
from django.contrib.sitemaps import views as sitemap_views
from django.views.decorators.cache import cache_page
from django.views.generic.simple import redirect_to
-from django_website.accounts import views as account_views
-from django_website.aggregator.feeds import CommunityAggregatorFeed, CommunityAggregatorFirehoseFeed
-from django_website.blog.feeds import WeblogEntryFeed
+
+from accounts import views as account_views
+from aggregator.feeds import CommunityAggregatorFeed, CommunityAggregatorFirehoseFeed
+from blog.feeds import WeblogEntryFeed
from django_website.sitemaps import FlatPageSitemap, WeblogSitemap
admin.autodiscover()
@@ -31,12 +32,12 @@
urlpatterns = patterns('',
url(r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'homepage.html'}, name="homepage"),
- url(r'^accounts/', include('django_website.accounts.urls')),
+ url(r'^accounts/', include('accounts.urls')),
url(r'^admin/', include(admin.site.urls)),
url(r'^comments/$', 'django.views.generic.list_detail.object_list', comments_info_dict),
url(r'^comments/', include('django.contrib.comments.urls')),
- url(r'^community/', include('django_website.aggregator.urls')),
- url(r'^contact/', include('django_website.contact.urls')),
+ url(r'^community/', include('aggregator.urls')),
+ url(r'^contact/', include('contact.urls')),
url(r'^r/', include('django.conf.urls.shortcut')),
# There's no school like the old school.
@@ -57,11 +58,11 @@
url(r'^subscriber/', include('django_push.subscriber.urls')),
url(r'^sitemap\.xml$', cache_page(sitemap_views.sitemap, 60 * 60 * 6), {'sitemaps': sitemaps}),
- url(r'^weblog/', include('django_website.blog.urls')),
+ url(r'^weblog/', include('blog.urls')),
url(r'^freenode\.9xJY7YIUWtwn\.html$', 'django.views.generic.simple.direct_to_template', {'template': 'freenode_tmp.html'}),
url(r'^download$', flatpage, {'url': 'download'}, name="download"),
- url(r'^svntogit/', include('django_website.svntogit.urls')),
- url(r'', include('django_website.legacy.urls')),
+ url(r'^svntogit/', include('svntogit.urls')),
+ url(r'', include('legacy.urls')),
)
if not settings.PRODUCTION:
View
0  django_website/blog/migrations/__init__.py → docs/__init__.py
File renamed without changes
View
0  django_website/docs/admin.py → docs/admin.py
File renamed without changes
View
0  ...o_website/docs/fixtures/doc_releases.json → docs/fixtures/doc_releases.json
File renamed without changes
View
0  django_website/docs/forms.py → docs/forms.py
File renamed without changes
View
0  django_website/blog/__init__.py → docs/management/__init__.py
File renamed without changes
View
0  ...bsite/aggregator/templatetags/__init__.py → docs/management/commands/__init__.py
File renamed without changes
View
0  ...e/docs/management/commands/update_docs.py → docs/management/commands/update_docs.py
File renamed without changes
View
0  ...o_website/docs/migrations/0001_initial.py → docs/migrations/0001_initial.py
File renamed without changes
View
0  ...ocs/migrations/0002_add_document_model.py → docs/migrations/0002_add_document_model.py
File renamed without changes
View
0  ...ocs/migrations/0003_fix_document_model.py → docs/migrations/0003_fix_document_model.py
File renamed without changes
View
0  ...e/docs/migrations/0004_add_git_support.py → docs/migrations/0004_add_git_support.py
File renamed without changes
View
0  ...website/aggregator/migrations/__init__.py → docs/migrations/__init__.py
File renamed without changes
View
0  django_website/docs/models.py → docs/models.py
File renamed without changes
View
0  django_website/docs/search_indexes.py → docs/search_indexes.py
File renamed without changes
View
0  django_website/docs/search_sites.py → docs/search_sites.py
File renamed without changes
View
0  django_website/docs/templates/docs/doc.html → docs/templates/docs/doc.html
File renamed without changes
View
0  ...website/docs/templates/docs/genindex.html → docs/templates/docs/genindex.html
File renamed without changes
View
0  ...go_website/docs/templates/docs/index.html → docs/templates/docs/index.html
File renamed without changes
View
0  ...site/docs/templates/docs/py-modindex.html → docs/templates/docs/py-modindex.html
File renamed without changes
View
0  ...o_website/docs/templates/docs/search.html → docs/templates/docs/search.html
File renamed without changes
View
0  ...site/docs/templates/docs/search_form.html → docs/templates/docs/search_form.html
File renamed without changes
View
0  ...ggregator/management/commands/__init__.py → docs/templatetags/__init__.py
File renamed without changes
View
0  django_website/docs/templatetags/docs.py → docs/templatetags/docs.py
File renamed without changes
View
0  django_website/docs/utils.py → docs/utils.py
File renamed without changes
View
0  django_website/docs/views.py → docs/views.py
File renamed without changes
View
0  ...website/aggregator/management/__init__.py → legacy/__init__.py
File renamed without changes
View
0  django_website/aggregator/__init__.py → legacy/models.py
File renamed without changes
View
0  django_website/legacy/urls.py → legacy/urls.py
File renamed without changes
View
0  django_website/legacy/views.py → legacy/views.py
File renamed without changes
View
0  ...o_website/accounts/migrations/__init__.py → svntogit/__init__.py
File renamed without changes
View
0  django_website/svntogit/mapping.py → svntogit/mapping.py
File renamed without changes
View
0  django_website/accounts/__init__.py → svntogit/models.py
File renamed without changes
View
0  django_website/svntogit/urls.py → svntogit/urls.py
File renamed without changes
View
0  django_website/svntogit/views.py → svntogit/views.py
File renamed without changes
View
0  tracdb/__init__.py
No changes.
View
0  django_website/trac/db_router.py → tracdb/db_router.py
File renamed without changes
View
0  ...o_website/trac/migrations/0001_initial.py → tracdb/migrations/0001_initial.py
File renamed without changes
View
0  tracdb/migrations/__init__.py
No changes.
View
0  django_website/trac/models.py → tracdb/models.py
File renamed without changes
View
0  django_website/trac/stats.py → tracdb/stats.py
File renamed without changes
View
0  django_website/trac/trac.sql → tracdb/trac.sql
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.