Skip to content

Commit fbd0cb1

Browse files
author
Jens Diemer
committed
Fix #117 and update Test matrix with Django 3.1, 4.1 and 4.2
* Remove max. version number from Python and Django in dependencies list. * Run all tests with Python 3.9, 3.10 and 3.11 and Django 3.1, 4.1 and 4.2 * Reverse version number from newest to oldest version ;)
1 parent 5ad1b82 commit fbd0cb1

6 files changed

+124
-73
lines changed

‎.github/workflows/pythonapp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
python-version: ["3.11", "3.10", "3.9"]
21-
django: ["3.2", "4.0", "4.1"]
21+
django: ["4.2", "4.1", "3.2"]
2222
steps:
2323
- name: Checkout
2424
run: |

bx_django_utils_tests/tests/test_admin_extra_views_index_page_django4.0.10_1.snapshot.html renamed to bx_django_utils_tests/tests/test_admin_extra_views_index_page_django4.2_1.snapshot.html

File renamed without changes.

bx_django_utils_tests/tests/test_feature_flag_integration_basic_django4.0.10_1.snapshot.html renamed to bx_django_utils_tests/tests/test_feature_flag_integration_basic_django4.2_1.snapshot.html

File renamed without changes.

‎bx_django_utils_tests/tests/test_html_assertion_assert_html_response_snapshot_django4.0.10_1.snapshot.html‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎bx_django_utils_tests/tests/test_html_assertion_assert_html_response_snapshot_django4.2_1.snapshot.html‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<!DOCTYPE html>
2+
<html dir="ltr" lang="en-us">
3+
<head>
4+
<title>
5+
Log in | Django site admin
6+
</title>
7+
<link href="/static/admin/css/base.css" rel="stylesheet"/>
8+
<link href="/static/admin/css/dark_mode.css" rel="stylesheet"/>
9+
<script defer="" src="/static/admin/js/theme.js">
10+
</script>
11+
<link href="/static/admin/css/nav_sidebar.css" rel="stylesheet"/>
12+
<script defer="" src="/static/admin/js/nav_sidebar.js">
13+
</script>
14+
<link href="/static/admin/css/login.css" rel="stylesheet"/>
15+
<script src="/static/user_timezone.js">
16+
</script>
17+
<meta content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0" name="viewport"/>
18+
<link href="/static/admin/css/responsive.css" rel="stylesheet"/>
19+
<meta content="NONE,NOARCHIVE" name="robots"/>
20+
</head>
21+
<body class="login" data-admin-utc-offset="0">
22+
<a class="skip-to-content-link" href="#content-start">
23+
Skip to main content
24+
</a>
25+
<!-- Container -->
26+
<div id="container">
27+
<!-- Header -->
28+
<div id="header">
29+
<div id="branding">
30+
<h1 id="site-name">
31+
<a href="/admin/">
32+
Django administration
33+
</a>
34+
</h1>
35+
<button class="theme-toggle">
36+
<div class="visually-hidden theme-label-when-auto">
37+
Toggle theme (current theme: auto)
38+
</div>
39+
<div class="visually-hidden theme-label-when-light">
40+
Toggle theme (current theme: light)
41+
</div>
42+
<div class="visually-hidden theme-label-when-dark">
43+
Toggle theme (current theme: dark)
44+
</div>
45+
<svg aria-hidden="true" class="theme-icon-when-auto">
46+
<use xlink:href="#icon-auto">
47+
</use>
48+
</svg>
49+
<svg aria-hidden="true" class="theme-icon-when-dark">
50+
<use xlink:href="#icon-moon">
51+
</use>
52+
</svg>
53+
<svg aria-hidden="true" class="theme-icon-when-light">
54+
<use xlink:href="#icon-sun">
55+
</use>
56+
</svg>
57+
</button>
58+
</div>
59+
</div>
60+
<!-- END Header -->
61+
<div class="main" id="main">
62+
<div class="content" id="content-start" tabindex="-1">
63+
<!-- Content -->
64+
<div class="colM" id="content">
65+
<div id="content-main">
66+
<form action="/admin/login/" id="login-form" method="post">
67+
MockedCsrfTokenNode
68+
<div class="form-row">
69+
<label class="required" for="id_username">
70+
Username:
71+
</label>
72+
<input autocapitalize="none" autocomplete="username" autofocus="" id="id_username" maxlength="150" name="username" required="" type="text"/>
73+
</div>
74+
<div class="form-row">
75+
<label class="required" for="id_password">
76+
Password:
77+
</label>
78+
<input autocomplete="current-password" id="id_password" name="password" required="" type="password"/>
79+
<input name="next" type="hidden" value="/admin/"/>
80+
</div>
81+
<div class="submit-row">
82+
<input type="submit" value="Log in"/>
83+
</div>
84+
</form>
85+
</div>
86+
<br class="clear"/>
87+
</div>
88+
<!-- END Content -->
89+
<div id="footer">
90+
</div>
91+
</div>
92+
</div>
93+
</div>
94+
<!-- END Container -->
95+
<!-- SVGs -->
96+
<svg class="base-svgs" xmlns="http://www.w3.org/2000/svg">
97+
<symbol height="1rem" id="icon-auto" viewbox="0 0 24 24" width="1rem">
98+
<path d="M0 0h24v24H0z" fill="currentColor">
99+
</path>
100+
<path d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2V4a8 8 0 1 0 0 16z">
101+
</path>
102+
</symbol>
103+
<symbol height="1rem" id="icon-moon" viewbox="0 0 24 24" width="1rem">
104+
<path d="M0 0h24v24H0z" fill="currentColor">
105+
</path>
106+
<path d="M10 7a7 7 0 0 0 12 4.9v.1c0 5.523-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2h.1A6.979 6.979 0 0 0 10 7zm-6 5a8 8 0 0 0 15.062 3.762A9 9 0 0 1 8.238 4.938 7.999 7.999 0 0 0 4 12z">
107+
</path>
108+
</symbol>
109+
<symbol height="1rem" id="icon-sun" viewbox="0 0 24 24" width="1rem">
110+
<path d="M0 0h24v24H0z" fill="currentColor">
111+
</path>
112+
<path d="M12 18a6 6 0 1 1 0-12 6 6 0 0 1 0 12zm0-2a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636 5.636 7.05 3.515 4.93zM16.95 18.364l1.414-1.414 2.121 2.121-1.414 1.414-2.121-2.121zm2.121-14.85l1.414 1.415-2.121 2.121-1.414-1.414 2.121-2.121zM5.636 16.95l1.414 1.414-2.121 2.121-1.414-1.414 2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z">
113+
</path>
114+
</symbol>
115+
</svg>
116+
<!-- END SVGs -->
117+
</body>
118+
</html>

‎pyproject.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ packages = [{ include = "bx_django_utils" }, { include = "bx_django_utils_tests"
2828
"Bug Tracker" = "https://github.com/boxine/bx_django_utils/issues"
2929

3030
[tool.poetry.dependencies]
31-
python = '>=3.9,<4.0.0'
32-
django = '>=3.2,<4.2'
31+
python = '>=3.9'
32+
django = '>=3.2'
3333
bx_py_utils = '*' # https://github.com/boxine/bx_py_utils
3434
python-stdnum = '*' # https://arthurdejong.org/python-stdnum/
3535

@@ -117,15 +117,15 @@ exclude_lines = [
117117
legacy_tox_ini = """
118118
[tox]
119119
isolated_build = True
120-
envlist = py{39,310,311}-django{3.2,4.0,4.1}
120+
envlist = py{311,310,39}-django{4.2,4.1,3.2}
121121
skip_missing_interpreters = True
122122
123123
[testenv]
124124
passenv = *
125125
deps =
126-
django3.2: django>=3.2,<3.3
127-
django4.0: django>=4.0,<4.1
126+
django4.2: django>=4.2,<4.3
128127
django4.1: django>=4.1,<4.2
128+
django3.2: django>=3.2,<3.3
129129
model-bakery
130130
playwright
131131
pdoc

0 commit comments

Comments
 (0)