Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8a02c10

Browse files
authored
Upgrade to Django 2.2. (python#1830)
* Upgrade to Django 2.2.Update dependencies for django 2.2 compatibility* Fix Github Action PostgreSQL config
1 parent8716928 commit8a02c10

File tree

91 files changed

+483
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+483
-266
lines changed

‎.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ jobs:
66
services:
77
postgres:
88
image:postgres:10.1
9+
env:
10+
POSTGRES_USER:postgres
11+
POSTGRES_PASSWORD:postgres
12+
POSTGRES_DB:pythonorg
913
ports:
10-
-5432:5432
14+
-5432:5432
15+
# needed because the postgres container does not provide a healthcheck
16+
options:--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
1117
steps:
1218
-name:Check out repository
1319
uses:actions/checkout@v2
@@ -33,7 +39,7 @@ jobs:
3339
run:|
3440
python -Wd -m coverage run manage.py test -v2
3541
env:
36-
DATABASE_URL:postgres://postgres:@127.0.0.1:5432/python.org
42+
DATABASE_URL:postgres://postgres:postgres@localhost:5432/pythonorg
3743
-name:Coverage
3844
run:|
3945
coverage report -m --fail-under=75

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,9 @@ static/stylesheets/no-mq.css
1717
static/stylesheets/style.css
1818
__pycache__
1919
*.db
20+
*.py[co]
2021
.vscode
2122
.~lock.*
23+
.idea
24+
.coverage
25+
.env

‎banners/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='banners.apps.BannersAppConfig'

‎banners/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classBannersAppConfig(AppConfig):
5+
6+
name='banners'

‎base-requirements.txt

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
dj-database-url==0.5.0
2-
django-pipeline==1.6.14
3-
django-sitetree==1.10.0
4-
Django==2.0.13
2+
django-pipeline==2.0.6
3+
django-sitetree==1.17.0
4+
Django==2.2.24
55
docutils==0.12
66
Markdown==3.3.4
7-
cmarkgfm==0.4.2
7+
cmarkgfm==0.6.0
88
Pillow==8.3.1
99
psycopg2==2.8.6
10-
python3-openid==3.1.0
10+
python3-openid==3.2.0
11+
python-decouple==3.4
1112
# lxml used by BeautifulSoup.
1213
lxml==4.6.3
13-
cssselect==0.9.1
14+
cssselect==1.1.0
1415
feedparser==6.0.8
15-
beautifulsoup4==4.6.0
16-
icalendar==3.8.4
16+
beautifulsoup4==4.9.3
17+
icalendar==4.0.7
1718
chardet==4.0.0
1819
# TODO: We may drop 'django-imagekit' completely.
1920
django-imagekit==4.0.2
20-
git+https://github.com/django-haystack/django-haystack.git@802b0f6f4b3b99314453261876a32bac2bbec94f
21+
django-haystack==3.0
2122
elasticsearch>=5,<6
2223
# TODO: 0.14.0 only supports Django 1.8 and 1.11.
23-
django-tastypie==0.14.1
24+
django-tastypie==0.14.3
2425

25-
pytz==2017.2
26-
python-dateutil==2.8.1
26+
pytz==2021.1
27+
python-dateutil==2.8.2
2728

2829
requests[security]>=2.26.0
2930

30-
django-honeypot==0.6.0
31-
django-markupfield==1.4.3
31+
django-honeypot==1.0.1
32+
django-markupfield==2.0.0
3233
django-markupfield-helpers==0.1.1
3334

3435
django-allauth==0.41.0
3536

36-
django-waffle==0.14
37+
django-waffle==2.2.1
3738

38-
djangorestframework==3.8.2
39-
django-filter==1.1.0
39+
djangorestframework==3.12.2
40+
django-filter==2.4.0
4041
django-ordered-model==3.4.3
4142
django-widget-tweaks==1.4.8
42-
django-countries==6.1.3
43+
django-countries==7.2.1
4344
xhtml2pdf==0.2.5
44-
django-easy-pdf==0.1.1
45+
django-easy-pdf3==0.1.2
4546
num2words==0.5.10
46-
django-polymorphic==2.1.2
47+
django-polymorphic==3.0.0
4748
sorl-thumbnail==12.7.0
4849
docxtpl==0.12.0

‎blogs/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='blogs.apps.BlogsAppConfig'

‎blogs/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classBlogsAppConfig(AppConfig):
5+
6+
name='blogs'

‎blogs/urls.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
fromdjango.conf.urlsimporturl
2-
31
from .importviews
2+
fromdjango.urlsimportpath
43

54
urlpatterns= [
6-
url(r'^$',views.BlogHome.as_view(),name='blog'),
5+
path('',views.BlogHome.as_view(),name='blog'),
76
]

‎boxes/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='boxes.apps.BoxesAppConfig'

‎boxes/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classBoxesAppConfig(AppConfig):
5+
6+
name='boxes'

‎boxes/factories.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
importfactory
55

66
fromdjango.confimportsettings
7+
fromfactory.djangoimportDjangoModelFactory
78

89
from .modelsimportBox
910

1011
fromusers.factoriesimportUserFactory
1112

1213

13-
classBoxFactory(factory.DjangoModelFactory):
14+
classBoxFactory(DjangoModelFactory):
1415

1516
classMeta:
1617
model=Box

‎boxes/urls.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
fromdjango.conf.urlsimporturl
2-
31
from .viewsimportbox
2+
fromdjango.urlsimportpath
43

54
urlpatterns= [
6-
url(r'(?P<label>[\w-]+)/$',box,name='box'),
5+
path('<slug:label>/',box,name='box'),
76
]

‎cms/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='cms.apps.CmsAppConfig'

‎cms/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classCmsAppConfig(AppConfig):
5+
6+
name='cms'

‎codesamples/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='codesamples.apps.CodesamplesAppConfig'

‎codesamples/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classCodesamplesAppConfig(AppConfig):
5+
6+
name='codesamples'

‎codesamples/factories.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
importtextwrap
22

33
importfactory
4+
fromfactory.djangoimportDjangoModelFactory
45

56
from .modelsimportCodeSample
67

78
fromusers.factoriesimportUserFactory
89

910

10-
classCodeSampleFactory(factory.DjangoModelFactory):
11+
classCodeSampleFactory(DjangoModelFactory):
1112

1213
classMeta:
1314
model=CodeSample

‎community/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='community.apps.CommunityAppConfig'

‎community/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classCommunityAppConfig(AppConfig):
5+
6+
name='community'

‎community/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fromdjango.contrib.postgres.fieldsimportJSONField
22
fromdjango.urlsimportreverse
33
fromdjango.dbimportmodels
4-
fromdjango.utils.translationimportugettext_lazyas_
4+
fromdjango.utils.translationimportgettext_lazyas_
55

66
frommarkupfield.fieldsimportMarkupField
77

‎community/urls.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
fromdjango.conf.urlsimporturl
2-
31
from .importviews
2+
fromdjango.urlsimportpath
43

54
app_name='community'
65
urlpatterns= [
7-
url(r'^$',views.PostList.as_view(),name='post_list'),
8-
url(r'^(?P<pk>\d+)/$',views.PostDetail.as_view(),name='post_detail'),
6+
path('',views.PostList.as_view(),name='post_list'),
7+
path('<int:pk>/',views.PostDetail.as_view(),name='post_detail'),
98
]

‎companies/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='companies.apps.CompaniesAppConfig'

‎companies/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classCompaniesAppConfig(AppConfig):
5+
6+
name='companies'

‎companies/factories.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
importfactory
2+
fromfactory.djangoimportDjangoModelFactory
23

34
from .modelsimportCompany
45

56

6-
classCompanyFactory(factory.DjangoModelFactory):
7+
classCompanyFactory(DjangoModelFactory):
78

89
classMeta:
910
model=Company

‎companies/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fromdjango.confimportsettings
22
fromdjango.dbimportmodels
3-
fromdjango.utils.translationimportugettext_lazyas_
3+
fromdjango.utils.translationimportgettext_lazyas_
44
frommarkupfield.fieldsimportMarkupField
55

66
fromcms.modelsimportNameSlugModel

‎dev-requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
# Required for running tests
44

5-
factory-boy==2.9.2
5+
factory-boy==3.1.0
66
Faker==0.8.1
77
tblib==1.7.0
8-
responses==0.10.5
8+
responses==0.13.3
99

1010
# Extra stuff required for local dev
1111

12-
django-debug-toolbar==1.9.1
12+
django-debug-toolbar==3.2.1
1313
coverage
1414
ddt
15-
model-bakery==1.2.0
15+
model-bakery==1.3.2

‎downloads/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default_app_config='downloads.apps.DownloadsAppConfig'

‎downloads/api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ class OSViewSet(viewsets.ModelViewSet):
8787
serializer_class=OSSerializer
8888
authentication_classes= (TokenAuthentication,)
8989
permission_classes= (IsStaffOrReadOnly,)
90-
filter_fields= ('name','slug')
90+
filterset_fields= ('name','slug')
9191

9292

9393
classReleaseViewSet(BaseAPIViewSet):
9494
model=Release
9595
serializer_class=ReleaseSerializer
9696
authentication_classes= (TokenAuthentication,)
9797
permission_classes= (IsStaffOrReadOnly,)
98-
filter_fields= (
98+
filterset_fields= (
9999
'name',
100100
'slug',
101101
'is_published',
@@ -123,7 +123,7 @@ class ReleaseFileViewSet(viewsets.ModelViewSet):
123123
serializer_class=ReleaseFileSerializer
124124
authentication_classes= (TokenAuthentication,)
125125
permission_classes= (IsStaffOrReadOnly,)
126-
filter_class=ReleaseFileFilter
126+
filterset_class=ReleaseFileFilter
127127

128128
@action(detail=False,methods=['delete'])
129129
defdelete_by_release(self,request):

‎downloads/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fromdjango.appsimportAppConfig
2+
3+
4+
classDownloadsAppConfig(AppConfig):
5+
6+
name='downloads'

‎downloads/factories.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
importfactory
44
importrequests
5+
fromfactory.djangoimportDjangoModelFactory
56

67
fromusers.factoriesimportUserFactory
78

89
from .modelsimportOS,Release,ReleaseFile
910

1011

11-
classOSFactory(factory.DjangoModelFactory):
12+
classOSFactory(DjangoModelFactory):
1213

1314
classMeta:
1415
model=OS
@@ -17,7 +18,7 @@ class Meta:
1718
creator=factory.SubFactory(UserFactory)
1819

1920

20-
classReleaseFactory(factory.DjangoModelFactory):
21+
classReleaseFactory(DjangoModelFactory):
2122

2223
classMeta:
2324
model=Release
@@ -27,7 +28,7 @@ class Meta:
2728
is_published=True
2829

2930

30-
classReleaseFileFactory(factory.DjangoModelFactory):
31+
classReleaseFileFactory(DjangoModelFactory):
3132

3233
classMeta:
3334
model=ReleaseFile

‎downloads/urls.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
fromdjango.conf.urlsimporturl
21
from .importviews
2+
fromdjango.urlsimportpath,re_path
33

44
app_name='downloads'
55
urlpatterns= [
6-
url(r'latest/python2/?$',views.DownloadLatestPython2.as_view(),name='download_latest_python2'),
7-
url(r'latest/python3/?$',views.DownloadLatestPython3.as_view(),name='download_latest_python3'),
8-
url(r'operating-systems/$',views.DownloadFullOSList.as_view(),name='download_full_os_list'),
9-
url(r'release/(?P<release_slug>[-_\w]+)/$',views.DownloadReleaseDetail.as_view(),name='download_release_detail'),
10-
url(r'(?P<slug>[-_\w]+)/$',views.DownloadOSList.as_view(),name='download_os_list'),
11-
url(r'$',views.DownloadHome.as_view(),name='download'),
6+
re_path(r'latest/python2/?$',views.DownloadLatestPython2.as_view(),name='download_latest_python2'),
7+
re_path(r'latest/python3/?$',views.DownloadLatestPython3.as_view(),name='download_latest_python3'),
8+
path('operating-systems/',views.DownloadFullOSList.as_view(),name='download_full_os_list'),
9+
path('release/<slug:release_slug>/',views.DownloadReleaseDetail.as_view(),name='download_release_detail'),
10+
path('<slug:slug>/',views.DownloadOSList.as_view(),name='download_os_list'),
11+
path('',views.DownloadHome.as_view(),name='download'),
1212
]

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp