Skip to content

Commit 68f239d

Browse files
committed
try bumping chameleon now that malthe/chameleon#390 is released
try 4.4.0 due to malthe/chameleon#395
1 parent bdf7b42 commit 68f239d

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

clastic/tests/test_chameleon_render.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def test_chameleon_mixed():
5858

5959
c = app.get_local_client()
6060
resp = c.get('/')
61-
assert resp.status_code == 200
61+
assert resp.status_code == 200, resp.data
6262
assert b'clasty' in resp.data
6363

6464
resp = c.get('/json/')
65-
assert resp.status_code == 200
65+
assert resp.status_code == 200, resp.data

requirements.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ashes
22
boltons
3-
chameleon<3.10 # 4.0 dropped 2.7 support, 3.10 made scopes dict-like in a way that breaks tests
3+
# when dropping py3.7, can make this >=4.4.0
4+
chameleon>=4.3.0 # 4.3.0 fixed the long-running dict iterability issue, see chameleon #390
45
coverage
56
face
67
mako

requirements.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ashes==19.2.0 # via -r requirements.in
88
boltons==23.1.1 # via -r requirements.in, face
99
build==1.0.3 # via pip-tools
1010
cachetools==5.3.2 # via tox
11-
chameleon==3.9.1 # via -r requirements.in
11+
chameleon>=4.3.0 # via -r requirements.in
1212
chardet==5.2.0 # via tox
1313
click==8.1.7 # via pip-tools
1414
colorama==0.4.6 # via tox
@@ -17,7 +17,8 @@ distlib==0.3.8 # via virtualenv
1717
exceptiongroup==1.2.0 # via pytest
1818
face==22.0.0 # via -r requirements.in
1919
filelock==3.12.2 # via tox, virtualenv
20-
importlib-metadata==6.7.0 # via build, click, mako, pluggy, pytest, tox, virtualenv
20+
importlib-metadata==6.7.0 # via build, chameleon, click, mako, pluggy, pytest, tox, virtualenv
21+
importlib-resources==5.12.0 # via chameleon
2122
iniconfig==2.0.0 # via pytest
2223
mako==1.2.4 # via -r requirements.in
2324
markupsafe==2.1.3 # via mako
@@ -36,7 +37,7 @@ typing-extensions==4.7.1 # via importlib-metadata, platformdirs, tox
3637
virtualenv==20.25.0 # via tox
3738
werkzeug==1.0.1 # via -r requirements.in, secure-cookie
3839
wheel==0.42.0 # via pip-tools
39-
zipp==3.15.0 # via importlib-metadata
40+
zipp==3.15.0 # via importlib-metadata, importlib-resources
4041

4142
# The following packages are considered to be unsafe in a requirements file:
4243
# pip

setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ def import_path(module_name, path):
4848
install_requires=[
4949
'Werkzeug>=1.0.0,<2.0',
5050
'ashes',
51-
'attrs<=21.4.0',
51+
'attrs',
5252
'boltons>=20.0.0',
53-
'glom<=23.1.1',
53+
'glom',
5454
'secure-cookie==0.1.0,<=0.2.0'],
5555
license=__license__,
5656
platforms='any',
5757
tests_require=[
58-
'chameleon==3.9.1',
58+
'chameleon>=4.4.0',
5959
'Mako',
6060
'pytest',
6161
'psutil'],

tox.ini

+7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ changedir = .tox
66
deps = -rrequirements.txt
77
commands = coverage run --parallel --rcfile {toxinidir}/.tox-coveragerc -m pytest {envsitepackagesdir}/clastic {posargs}
88

9+
[testenv:py311]
10+
# chameleon 4.3.0 is broken on windows, and 4.4.0 dropped py3.7
11+
# when dropping py3.7, can remove this
12+
deps =
13+
-rrequirements.txt
14+
chameleon>=4.4.0
15+
916
[testenv:coverage-report]
1017
depends = py37,py38,py39,py310,py311,pypy3
1118
changedir = .tox

0 commit comments

Comments
 (0)