Skip to content

[WIP] started adding django 3.2 support #1434

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

[WIP] started adding django 3.2 support #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dd380d
started adding django 2.2 support
auvipy May 9, 2019
7fb9c05
updated urls to django 2.0+
auvipy May 9, 2019
6152927
updated django to 2.1 and drf to 3.8.3
auvipy May 9, 2019
b5b7521
updated requirements versions
auvipy May 9, 2019
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
14 changes: 7 additions & 7 deletions base-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
dj-database-url==0.5.0
django-pipeline==1.6.14
django-sitetree==1.10.0
Django==2.0.13
Django==2.1.8
docutils==0.12
Markdown==2.5.2
Pillow==5.1.0
psycopg2==2.7.3.2
psycopg2==2.8.2
python3-openid==3.1.0
# lxml used by BeautifulSoup.
lxml==4.1.1
Expand All @@ -26,12 +26,12 @@ python-dateutil==2.6.1

requests[security]>=2.20.0

django-honeypot==0.6.0
django-markupfield==1.4.3
django-honeypot==0.7.0
django-markupfield==1.5.1

django-allauth==0.36.0
django-allauth==0.39.1

django-waffle==0.14

djangorestframework==3.8.2
django-filter==1.1.0
djangorestframework==3.9.3
django-filter==2.1.0
151 changes: 107 additions & 44 deletions pydotorg/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from django.conf.urls import include, url, handler404
from django.conf.urls import include, handler404
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.conf.urls.static import static
from django.views.generic.base import TemplateView, RedirectView
from django.conf import settings
from django.urls import path, re_path

from cms.views import custom_404
from users.views import HoneypotSignupView, CustomPasswordChangeView
Expand All @@ -15,73 +16,135 @@

urlpatterns = [
# homepage
url(r'^$', views.IndexView.as_view(), name='home'),
url(r'^authenticated$', views.AuthenticatedView.as_view(), name='authenticated'),
url(r'^humans.txt$', TemplateView.as_view(template_name='humans.txt', content_type='text/plain')),
url(r'^robots.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')),
url(r'^shell/$', TemplateView.as_view(template_name="python/shell.html"), name='shell'),
path('', views.IndexView.as_view(), name='home'),
path(
'authenticated',
views.AuthenticatedView.as_view(),
name='authenticated'
),
path('humans.txt', TemplateView.as_view(
template_name='humans.txt', content_type='text/plain')),
path('robots.txt', TemplateView.as_view(
template_name='robots.txt', content_type='text/plain')),
path(
'shell/',
TemplateView.as_view(template_name="python/shell.html"),
name='shell'
),

# python section landing pages
url(r'^about/$', TemplateView.as_view(template_name="python/about.html"), name='about'),
path(
'about/',
TemplateView.as_view(template_name="python/about.html"),
name='about'
),

# Redirect old download links to new downloads pages
url(r'^download/$', RedirectView.as_view(url='https://www.python.org/downloads/', permanent=True)),
url(r'^download/source/$', RedirectView.as_view(url='https://www.python.org/downloads/source/', permanent=True)),
url(r'^download/mac/$', RedirectView.as_view(url='https://www.python.org/downloads/mac-osx/', permanent=True)),
url(r'^download/windows/$', RedirectView.as_view(url='https://www.python.org/downloads/windows/', permanent=True)),
path(
'download/',
RedirectView.as_view(
url='https://www.python.org/downloads/',
permanent=True)
),
path(
'download/source/',
RedirectView.as_view(
url='https://www.python.org/downloads/source/',
permanent=True)),
path('download/mac/', RedirectView.as_view(
url='https://www.python.org/downloads/mac-osx/',
permanent=True)
),
path(
'download/windows/',
RedirectView.as_view(
url='https://www.python.org/downloads/windows/',
permanent=True)
),

# duplicated downloads to getit to bypass China's firewall. See
# https://github.com/python/pythondotorg/issues/427 for more info.
url(r'^getit/', include('downloads.urls', namespace='getit')),
url(r'^downloads/', include('downloads.urls', namespace='download')),
url(r'^doc/$', views.DocumentationIndexView.as_view(), name='documentation'),
url(r'^blog/$', RedirectView.as_view(url='/blogs/', permanent=True)),
url(r'^blogs/', include('blogs.urls')),
url(r'^inner/$', TemplateView.as_view(template_name="python/inner.html"), name='inner'),
path('getit/', include('downloads.urls', namespace='getit')),
path('downloads/', include('downloads.urls', namespace='download')),
path('doc/', views.DocumentationIndexView.as_view(), name='documentation'),
path('blog/', RedirectView.as_view(url='/blogs/', permanent=True)),
path('blogs/', include('blogs.urls')),
path(
'inner/',
TemplateView.as_view(template_name="python/inner.html"),
name='inner'
),

# other section landing pages
url(r'^psf-landing/$', TemplateView.as_view(template_name="psf/index.html"), name='psf-landing'),
url(r'^docs-landing/$', TemplateView.as_view(template_name="docs/index.html"), name='docs-landing'),
url(r'^pypl-landing/$', TemplateView.as_view(template_name="pypl/index.html"), name='pypl-landing'),
url(r'^shop-landing/$', TemplateView.as_view(template_name="shop/index.html"), name='shop-landing'),
path(
'^psf-landing/',
TemplateView.as_view(template_name="psf/index.html"),
name='psf-landing'
),
path(
'docs-landing/',
TemplateView.as_view(template_name="docs/index.html"),
name='docs-landing'),
path(
'pypl-landing/',
TemplateView.as_view(template_name="pypl/index.html"),
name='pypl-landing'
),
path(
'shop-landing/',
TemplateView.as_view(template_name="shop/index.html"),
name='shop-landing'
),

# Override /accounts/signup/ to add Honeypot.
url(r'^accounts/signup/', HoneypotSignupView.as_view()),
path('accounts/signup/', HoneypotSignupView.as_view()),
# Override /accounts/password/change/ to add Honeypot
# and change success URL.
url(r'^accounts/password/change/$', CustomPasswordChangeView.as_view(),
name='account_change_password'),
url(r'^accounts/', include('allauth.urls')),
url(r'^box/', include('boxes.urls')),
url(r'^community/', include('community.urls', namespace='community')),
url(r'^community/microbit/$', TemplateView.as_view(template_name="community/microbit.html"), name='microbit'),
url(r'^events/', include('events.urls', namespace='events')),
url(r'^jobs/', include('jobs.urls', namespace='jobs')),
url(r'^sponsors/', include('sponsors.urls')),
url(r'^success-stories/', include('successstories.urls')),
url(r'^users/', include('users.urls', namespace='users')),
path(
'accounts/password/change/',
CustomPasswordChangeView.as_view(),
name='account_change_password'
),
path('accounts/', include('allauth.urls')),
path('box/', include('boxes.urls')),
path('community/', include('community.urls', namespace='community')),
path(
'community/microbit/',
TemplateView.as_view(template_name="community/microbit.html"),
name='microbit'
),
path('events/', include('events.urls', namespace='events')),
path('jobs/', include('jobs.urls', namespace='jobs')),
path('sponsors/', include('sponsors.urls')),
path('success-stories/', include('successstories.urls')),
path('users/', include('users.urls', namespace='users')),

url(r'^psf/records/board/minutes/', include('minutes.urls')),
url(r'^membership/', include('membership.urls')),
url(r'^search/', include('haystack.urls')),
url(r'^nominations/', include('nominations.urls')),
path('psf/records/board/minutes/', include('minutes.urls')),
path('membership/', include('membership.urls')),
path('search/', include('haystack.urls')),
path('nominations/', include('nominations.urls')),
# admin
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', admin.site.urls),
path('admin/doc/', include('django.contrib.admindocs.urls')),
path('admin/', admin.site.urls),

# api
url(r'^api/', include(v1_api.urls)),
url(r'^api/v2/', include(router.urls)),
re_path(r'^api/', include(v1_api.urls)),
path('api/v2/', include(router.urls)),

# storage migration
url(r'^m/(?P<url>.*)/$', views.MediaMigrationView.as_view(prefix='media'), name='media_migration_view'),
re_path(
r'^m/(?P<url>.*)/$',
views.MediaMigrationView.as_view(prefix='media'),
name='media_migration_view'
),
]

urlpatterns += staticfiles_urlpatterns()

if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.MEDIA_URL,
document_root=settings.MEDIA_ROOT)
import debug_toolbar
urlpatterns = [
url(r'^__debug__/', include(debug_toolbar.urls)),
re_path(r'^__debug__/', include(debug_toolbar.urls)),
] + urlpatterns