Skip to content
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.

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

Drop support for end-of-life Wagtail versions, add support for Wagtail 6.0 #77

Merged
merged 2 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,14 @@
"Programming Language :: Python :: 3.12",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 4",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
],
install_requires=[
"Wagtail>=4.1",
"Wagtail>=5.2",
"user-agents>=2.2,<2.3",
"numpy>=1.19.4,<2",
"scipy>=1.5.4,<2",
Expand Down
17 changes: 6 additions & 11 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ skipsdist = True
usedevelop = True

envlist =
py{38,39,310}-django{32,40,41}-wagtail{41,42}-{sqlite,postgres}
py311-django41-wagtail{41,42}-{sqlite,postgres}
py{38,39,310,311}-django{32,41,42}-wagtail{50,51,52}-{sqlite,postgres}
py312-django{42,50}-wagtail52-{sqlite,postgres}
py{38,39,310,311}-django{32,42}-wagtail52-{sqlite,postgres}
py{38,39,310,311}-django42-wagtail60-{sqlite,postgres}
py312-django{42,50}-wagtail{52,60}-{sqlite,postgres}

[flake8]
# E501: Line too long
Expand All @@ -28,16 +27,12 @@ basepython =
deps =
coverage
django32: django>=3.2,<4.0
django40: django>=4.0,<4.1
django41: django>=4.1,<4.2
django42: django>=4.2,<5
django50: django>=5.0,<5.1

wagtail41: wagtail~=4.1
wagtail42: wagtail~=4.2
wagtail50: wagtail~=5.0
wagtail51: wagtail~=5.1
wagtail52: wagtail~=5.2
wagtail42: wagtail~=4.2.0
wagtail52: wagtail~=5.2.0
wagtail60: wagtail~=6.0.0
Stormheg marked this conversation as resolved.
Show resolved Hide resolved
wagtailmain: git+https://github.com/wagtail/wagtail.git

postgres: psycopg2>=2.9
Expand Down
42 changes: 21 additions & 21 deletions wagtail_ab_testing/static_src/styles/sections.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@
color: inherit;
font-size: inherit;
}
&::before {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-shadow: none;
font-family: wagtail;
text-transform: none;
content: '';
text-align: center;
display: block;
position: absolute;
z-index: 2;
font-size: 2em;
top: 0;
line-height: 1.8em;
left: 0;
width: 50px;
color: #fff;
padding: 0;
margin: 0;
background-color: #f37e77;
}
}

&__icon {
height: 1rem;
width: 1rem;
}

&__icon-container {
display: flex;
align-items: center;
justify-content: center;
position: absolute;
z-index: 2;
top: 0;
bottom: 0;
left: 0;
width: 50px;
color: #fff;
padding: 0;
margin: 0;
background-color: #f37e77;
}

&__content {
Expand Down
10 changes: 10 additions & 0 deletions wagtail_ab_testing/templates/wagtail_ab_testing/add_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@

<section class="section">
<div class="section__title">
<div class="section__icon-container">
{% icon "arrow-down" classname="section__icon" %}
</div>
<h3>{% trans "Enter test details" %}</h3>
</div>

<div class="section__content nice-padding">
<ul class="fields">
<li>
{# TODO: Wagtail 6.0 introduced {% formattedfield %} to replace this template include #}
{% include "wagtailadmin/shared/field.html" with field=form.name %}
</li>
<li>
Expand All @@ -29,6 +33,9 @@ <h3>{% trans "Enter test details" %}</h3>

<section class="section">
<div class="section__title">
<div class="section__icon-container">
{% icon "arrow-down" classname="section__icon" %}
</div>
<h3>{% trans "Choose a goal" %}</h3>
</div>

Expand All @@ -40,6 +47,9 @@ <h3>{% trans "Choose a goal" %}</h3>

<section class="section">
<div class="section__title">
<div class="section__icon-container">
{% icon "arrow-down" classname="section__icon" %}
</div>
<h3>{% trans "Sample size" %}</h3>
</div>

Expand Down
Loading