Skip to content

Commit 33c4e38

Browse files
vsalvinovsalvino
committed
Test python 3.13, drop 3.8
1 parent 2c0de93 commit 33c4e38

File tree

4 files changed

+42
-46
lines changed

4 files changed

+42
-46
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ celerybeat.pid
111111

112112
# Environments
113113
.env
114-
.venv
114+
.venv*
115115
env/
116116
venv/
117117
ENV/

‎azure-pipelines.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111
#
1212
# Use PowerShell Core for any utility scripts so they are reusable across
1313
# Windows, macOS, and Linux.
14-
#
15-
1614

1715
trigger:
1816
- main
1917

20-
2118
stages:
2219
- stage: Unit_Tests
2320
displayName: Unit Tests
@@ -29,9 +26,6 @@ stages:
2926
vmImage: 'ubuntu-latest'
3027
strategy:
3128
matrix:
32-
py3.8_wag3:
33-
PYTHON_VERSION: '3.8'
34-
WAGTAIL: '3.*'
3529
py3.9_wag4:
3630
PYTHON_VERSION: '3.9'
3731
WAGTAIL: '4.*'
@@ -44,6 +38,9 @@ stages:
4438
py3.12_wag6:
4539
PYTHON_VERSION: '3.12'
4640
WAGTAIL: '6.*'
41+
py3.13_wag6:
42+
PYTHON_VERSION: '3.13'
43+
WAGTAIL: '6.*'
4744

4845
steps:
4946
- task: UsePythonVersion@0
@@ -91,7 +88,7 @@ stages:
9188
- task: UsePythonVersion@0
9289
displayName: 'Use Python version'
9390
inputs:
94-
versionSpec: '3.12'
91+
versionSpec: '3.13'
9592
architecture: 'x64'
9693

9794
- script: python -m pip install -r requirements-dev.txt
@@ -118,7 +115,7 @@ stages:
118115
- task: UsePythonVersion@0
119116
displayName: 'Use Python version'
120117
inputs:
121-
versionSpec: '3.11'
118+
versionSpec: '3.13'
122119
architecture: 'x64'
123120

124121
- script: python -m pip install -r requirements-dev.txt

‎pyproject.toml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ authors = [
1111
classifiers = [
1212
"Framework :: Django",
1313
"Framework :: Wagtail",
14-
"Framework :: Wagtail :: 3",
1514
"Framework :: Wagtail :: 4",
1615
"Framework :: Wagtail :: 5",
1716
"Framework :: Wagtail :: 6",
@@ -24,14 +23,14 @@ classifiers = [
2423
"Topic :: Internet :: WWW/HTTP :: Site Management",
2524
]
2625
dependencies = [
27-
"wagtail>=3.0,<7",
26+
"wagtail>=4.0,<7",
2827
]
2928
description = "Search engine and social media optimization for Wagtail."
3029
dynamic = ["version"]
3130
license = {file = "LICENSE.txt"}
3231
name = "wagtail-seo"
3332
readme = "README.md"
34-
requires-python = ">=3.8"
33+
requires-python = ">=3.9"
3534

3635
[project.urls]
3736
Source = "https://github.com/coderedcorp/wagtail-seo"

‎testproject/home/tests.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -154,20 +154,20 @@ def test_meta(self):
154154
self.assertInHTML(
155155
f"""
156156
<head>
157-
<title>{ page.seo_pagetitle }</title>
158-
<link rel="canonical" href="{ page.seo_canonical_url }">
159-
<meta name="description" content="{ page.seo_description }" />
160-
<meta property="og:title" content="{ page.seo_pagetitle }" />
161-
<meta property="og:description" content="{ page.seo_description }" />
162-
<meta property="og:image" content="{ page.seo_image_url }" />
163-
<meta property="og:site_name" content="{ page.seo_sitename }" />
164-
<meta property="og:url" content="{ page.seo_canonical_url }" />
165-
<meta property="og:type" content="{ page.seo_og_type }" />
166-
<meta name="twitter:card" content="{ page.seo_twitter_card_content }" />
167-
<meta name="twitter:title" content="{ page.seo_pagetitle }">
168-
<meta name="twitter:image" content="{ page.seo_image_url }">
169-
<meta name="twitter:description" content="{ page.seo_description }" />
170-
<meta name="twitter:site" content="{ seo_set.at_twitter_site }" />
157+
<title>{page.seo_pagetitle}</title>
158+
<link rel="canonical" href="{page.seo_canonical_url}">
159+
<meta name="description" content="{page.seo_description}" />
160+
<meta property="og:title" content="{page.seo_pagetitle}" />
161+
<meta property="og:description" content="{page.seo_description}" />
162+
<meta property="og:image" content="{page.seo_image_url}" />
163+
<meta property="og:site_name" content="{page.seo_sitename}" />
164+
<meta property="og:url" content="{page.seo_canonical_url}" />
165+
<meta property="og:type" content="{page.seo_og_type}" />
166+
<meta name="twitter:card" content="{page.seo_twitter_card_content}" />
167+
<meta name="twitter:title" content="{page.seo_pagetitle}">
168+
<meta name="twitter:image" content="{page.seo_image_url}">
169+
<meta name="twitter:description" content="{page.seo_description}" />
170+
<meta name="twitter:site" content="{seo_set.at_twitter_site}" />
171171
</head>
172172
""",
173173
response.content.decode("utf8"),
@@ -186,24 +186,24 @@ def test_meta_article(self):
186186
self.assertInHTML(
187187
f"""
188188
<head>
189-
<title>{ page.seo_pagetitle }</title>
190-
<link rel="canonical" href="{ page.seo_canonical_url }">
191-
<meta name="description" content="{ page.seo_description }" />
192-
<meta name="author" content="{ page.seo_author }" />
193-
<meta property="og:title" content="{ page.seo_pagetitle }" />
194-
<meta property="og:description" content="{ page.seo_description }" />
195-
<meta property="og:image" content="{ page.seo_image_url }" />
196-
<meta property="og:site_name" content="{ page.seo_sitename }" />
197-
<meta property="og:url" content="{ page.seo_canonical_url }" />
198-
<meta property="og:type" content="{ page.seo_og_type }" />
199-
<meta property="article:author" content="{ page.seo_author }" />
200-
<meta property="article:published_time" content="{ utils.serialize_date(page.seo_published_at) }" />
201-
<meta property="article:modified_time" content="{ utils.serialize_date(page.last_published_at) }" />
202-
<meta name="twitter:card" content="{ page.seo_twitter_card_content }" />
203-
<meta name="twitter:title" content="{ page.seo_pagetitle }">
204-
<meta name="twitter:image" content="{ page.seo_image_url }">
205-
<meta name="twitter:description" content="{ page.seo_description }" />
206-
<meta name="twitter:site" content="{ seo_set.at_twitter_site }" />
189+
<title>{page.seo_pagetitle}</title>
190+
<link rel="canonical" href="{page.seo_canonical_url}">
191+
<meta name="description" content="{page.seo_description}" />
192+
<meta name="author" content="{page.seo_author}" />
193+
<meta property="og:title" content="{page.seo_pagetitle}" />
194+
<meta property="og:description" content="{page.seo_description}" />
195+
<meta property="og:image" content="{page.seo_image_url}" />
196+
<meta property="og:site_name" content="{page.seo_sitename}" />
197+
<meta property="og:url" content="{page.seo_canonical_url}" />
198+
<meta property="og:type" content="{page.seo_og_type}" />
199+
<meta property="article:author" content="{page.seo_author}" />
200+
<meta property="article:published_time" content="{utils.serialize_date(page.seo_published_at)}" />
201+
<meta property="article:modified_time" content="{utils.serialize_date(page.last_published_at)}" />
202+
<meta name="twitter:card" content="{page.seo_twitter_card_content}" />
203+
<meta name="twitter:title" content="{page.seo_pagetitle}">
204+
<meta name="twitter:image" content="{page.seo_image_url}">
205+
<meta name="twitter:description" content="{page.seo_description}" />
206+
<meta name="twitter:site" content="{seo_set.at_twitter_site}" />
207207
</head>
208208
""", # noqa
209209
response.content.decode("utf8"),
@@ -279,7 +279,7 @@ def test_struct_org(self):
279279
self.assertInHTML(
280280
f"""
281281
<script type="application/ld+json">
282-
{ expected_json }
282+
{expected_json}
283283
</script>
284284
""", # noqa
285285
response.content.decode("utf8"),
@@ -326,7 +326,7 @@ def test_struct_article(self):
326326
self.assertInHTML(
327327
f"""
328328
<script type="application/ld+json">
329-
{ expected_json }
329+
{expected_json}
330330
</script>
331331
""", # noqa
332332
response.content.decode("utf8"),

0 commit comments

Comments
 (0)