Skip to content

Commit 3557f44

Browse files
committed
modernize tested python versions
1 parent ef0abaf commit 3557f44

File tree

4 files changed

+43
-54
lines changed

4 files changed

+43
-54
lines changed

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
'mock',
1515
'openpyxl',
1616
'psycopg2-binary',
17-
# pinned to version in our package index.
18-
'pyodbc==4.0.34',
17+
'pyodbc',
1918
'pytest',
2019
'pytest-cov',
2120
'Flask',

stable-requirements.txt

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,45 @@
1-
arrow==1.2.2
2-
attrs==22.1.0
3-
beautifulsoup4==4.11.1
4-
BlazeUtils==0.6.5
5-
blinker==1.5
6-
build==0.8.0
7-
click==8.1.3
8-
coverage==6.4.3
9-
cssselect==1.1.0
10-
dominate==2.7.0
1+
arrow==1.3.0
2+
beautifulsoup4==4.12.3
3+
BlazeUtils==0.7.0
4+
blinker==1.8.2
5+
click==8.1.7
6+
coverage==7.6.0
7+
cssselect==1.2.0
8+
dominate==2.9.1
119
et-xmlfile==1.1.0
12-
Flask==2.2.2
10+
Flask==3.0.3
1311
Flask-Bootstrap==3.3.7.1
14-
Flask-SQLAlchemy==2.5.1
15-
Flask-WebTest==0.0.9
16-
Flask-WTF==1.0.1
17-
greenlet==1.1.2
18-
importlib-metadata==4.12.0
19-
iniconfig==1.1.1
20-
itsdangerous==2.1.2
21-
Jinja2==3.1.2
22-
lxml==4.9.1
23-
MarkupSafe==2.1.1
24-
mock==4.0.3
25-
openpyxl==3.0.10
26-
packaging==21.3
27-
pep517==0.13.0
28-
pip-tools==6.8.0
29-
pluggy==1.0.0
30-
psycopg2-binary==2.9.3
31-
py==1.11.0
32-
pyodbc==4.0.34
33-
pyparsing==3.0.9
34-
pyquery==1.4.3
35-
pytest==7.1.2
36-
pytest-cov==3.0.0
37-
python-dateutil==2.8.2
12+
Flask-SQLAlchemy==3.1.1
13+
Flask-WebTest==0.1.4
14+
Flask-WTF==1.2.1
15+
greenlet==3.0.3
16+
iniconfig==2.0.0
17+
itsdangerous==2.2.0
18+
Jinja2==3.1.4
19+
lxml==5.2.2
20+
MarkupSafe==2.1.5
21+
mock==5.1.0
22+
openpyxl==3.1.5
23+
packaging==24.1
24+
pluggy==1.5.0
25+
psycopg2-binary==2.9.9
26+
pyodbc==5.1.0
27+
pyquery==2.0.0
28+
pytest==8.2.2
29+
pytest-cov==5.0.0
30+
python-dateutil==2.9.0.post0
3831
six==1.16.0
39-
soupsieve==2.3.2.post1
40-
SQLAlchemy==1.4.40
41-
sqlalchemy-pyodbc-mssql==0.1.0
42-
SQLAlchemy-Utils==0.38.3
43-
tomli==2.0.1
32+
soupsieve==2.5
33+
SQLAlchemy==2.0.31
34+
sqlalchemy-pyodbc-mssql==0.1.1
35+
SQLAlchemy-Utils==0.41.2
36+
types-python-dateutil==2.9.0.20240316
37+
typing_extensions==4.12.2
4438
visitor==0.1.3
45-
waitress==2.1.2
39+
waitress==3.0.0
4640
WebOb==1.8.7
4741
WebTest==3.0.0
48-
Werkzeug==2.2.2
49-
wrapt==1.14.1
50-
WTForms==3.0.1
51-
xlrd==2.0.1
52-
XlsxWriter==3.0.3
53-
xlwt==1.3.0
54-
zipp==3.8.1
42+
Werkzeug==3.0.3
43+
wrapt==1.16.0
44+
WTForms==3.1.2
45+
XlsxWriter==3.2.0

tox.ini

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{37,38,39,310}-{base,i18n,stable},py39-oldsa,flake8,docs,i18n
2+
envlist = py{310,311}-{base,i18n,stable},py312-{base,stable},flake8,docs,i18n
33

44

55
[testenv]
@@ -14,9 +14,8 @@ recreate = true
1414
passenv = SQLALCHEMY_DATABASE_URI
1515

1616
commands =
17-
oldsa: pip install --progress-bar off sqlalchemy~=1.4.1 flask-sqlalchemy~=2.5.1 flask<3.0
1817
stable: pip install --progress-bar off -r ./stable-requirements.txt
19-
base,stable,oldsa: pip install --progress-bar off -e .[develop]
18+
base,stable: pip install --progress-bar off -e .[develop]
2019
i18n: pip install --progress-bar off -e .[develop,i18n]
2120
pip freeze
2221
py.test \

webgrid/tests/test_testing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_generators(self):
4646

4747

4848
class TestAssertRenderedXlsxMatches:
49-
def setup(self):
49+
def setup_method(self):
5050
self.stream = BytesIO()
5151
self.workbook = xlsxwriter.Workbook(self.stream, options={'in_memory': True})
5252
self.sheet = self.workbook.add_worksheet('sheet1')

0 commit comments

Comments
 (0)