Skip to content

Commit f944d17

Browse files
committed
Update dependencies and support Python 3.11
1 parent 8d1a1f4 commit f944d17

File tree

11 files changed

+33
-30
lines changed

11 files changed

+33
-30
lines changed

.github/workflows/release-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Set up Python 3.9
15+
- name: Set up Python 3.10
1616
uses: actions/setup-python@v2
1717
with:
18-
python-version: 3.9
18+
python-version: "3.10"
1919
- name: Install dependencies
2020
run: |
2121
python -m pip install --upgrade pip

.github/workflows/test-package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
max-parallel: 4
1111
matrix:
12-
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3']
12+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3']
1313

1414
steps:
1515
- uses: actions/checkout@v2
@@ -22,11 +22,11 @@ jobs:
2222
python -m pip install --upgrade pip
2323
pip install .[tests]
2424
- name: Lint with flake8
25-
if: matrix.python-version == 3.9
25+
if: matrix.python-version == '3.10'
2626
run: |
2727
flake8 webware setup.py --count --exit-zero --statistics
2828
- name: Lint with pylint
29-
if: matrix.python-version == 3.9
29+
if: matrix.python-version == '3.10'
3030
run: |
3131
pylint webware
3232
- name: Run all unit tests

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
# -- Project information -----------------------------------------------------
2323

2424
project = 'Webware for Python 3'
25-
copyright = '1999-2022, Christoph Zwerschke et al'
25+
copyright = '1999-2023, Christoph Zwerschke et al'
2626
author = 'Christoph Zwerschke et al.'
2727

2828
# The short X.Y version
2929
version = '3.0'
3030
# The full version, including alpha/beta/rc tags
31-
release = '3.0.6'
31+
release = '3.0.7'
3232

3333

3434
# -- General configuration ---------------------------------------------------

setup.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
long_description = fh.read()
1212

1313
requireDocs = [
14-
'Sphinx>=5,<6', 'sphinx_rtd_theme>=1'
14+
'Sphinx>=5,<7', 'sphinx_rtd_theme>=1.1'
1515
]
1616
requireDev = [
17-
'Pygments>=2.12,<3', 'WebTest>=3,<4',
17+
'Pygments>=2.14,<3', 'WebTest>=3,<4',
1818
'waitress>=2,<3', 'hupper>=1.10,<2',
1919
]
2020
requireExamples = [
21-
'DBUtils>=3,<4', 'dominate>=2.6,<3', 'yattag>=1.14,<2',
22-
'Pygments>=2.12,<3', 'Pillow>=8,<10'
21+
'DBUtils>=3,<4', 'dominate>=2.7,<3', 'yattag>=1.15,<2',
22+
'Pygments>=2.14,<3', 'Pillow>=8,<10'
2323
]
2424
requireTests = [
25-
'psutil>=5.9,<6', 'flake8>=4,<5', 'pylint>=2.13.9,<3', 'tox>=3.25,<4',
25+
'psutil>=5.9,<6', 'flake8>=5,<7', 'pylint>=2.13,<3', 'tox>=3.28,<5',
2626
'pywin32>=300,<400;'
2727
'sys_platform=="win32" and implementation_name=="cpython"'
2828
] + requireDev + requireExamples
@@ -59,6 +59,7 @@
5959
'Programming Language :: Python :: 3.8',
6060
'Programming Language :: Python :: 3.9',
6161
'Programming Language :: Python :: 3.10',
62+
'Programming Language :: Python :: 3.11',
6263
'Programming Language :: Python :: Implementation :: CPython',
6364
'Programming Language :: Python :: Implementation :: PyPy',
6465
'Operating System :: OS Independent',

tox.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
[tox]
2-
envlist = py{36,37,38,39,310}, pypy3, flake8, pylint, docs, manifest
2+
envlist = py{36,37,38,39,310,311}, pypy3, flake8, pylint, docs, manifest
33

44
[testenv:flake8]
5-
basepython = python3.9
6-
deps = flake8>=4.0.1,<5
5+
basepython = python3.10
6+
deps = flake8>=6,<7
77
commands =
88
flake8 webware setup.py
99

1010
[testenv:pylint]
11-
basepython = python3.9
12-
deps = pylint>=2.14.4,<3
11+
basepython = python3.10
12+
deps = pylint>=2.15,<3
1313
commands =
1414
pylint webware
1515

1616
[testenv:docs]
17-
basepython = python3.9
17+
basepython = python3.10
1818
extras =
1919
docs
2020
commands =
2121
sphinx-build -b html -nEW docs docs/_build/html
2222

2323
[testenv:manifest]
24-
basepython = python3.9
25-
deps = check-manifest>=0.47
24+
basepython = python3.10
25+
deps = check-manifest>=0.49
2626
commands =
2727
check-manifest -v
2828

webware/MiscUtils/Tests/TestFuncs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def testLocalIP(self):
9191
self.assertEqual(localIP(), ip) # second invocation
9292
self.assertEqual(localIP(useCache=None), ip)
9393
# ignore if the following tests fetch the WSL address
94-
ips = (ip, '192.168.80.1', '172.25.112.1')
94+
ips = (ip, '192.168.80.1', '172.22.32.1', '172.25.112.1')
9595
self.assertIn(
9696
localIP(remote=None, useCache=None), ips,
9797
'See if this works: localIP(remote=None).'

webware/Properties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = 'Webware for Python'
22

3-
version = (3, 0, 6)
3+
version = (3, 0, 7)
44

55
status = 'stable'
66

webware/Scripts/MakeAppWorkDir.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ def changeOwner(self):
277277
self.msg("\tWarning: Write permissions could not be set.")
278278
self.msg(f"\tThe error message was: {e}")
279279

280-
def printCompleted(self):
280+
@staticmethod
281+
def printCompleted():
281282
print("""
282283
Congratulations, you've just created a runtime working directory for Webware.
283284

webware/Scripts/WaitressServer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def openBrowser():
2929
webbrowser.open(url)
3030

3131
t = threading.Thread(target=openBrowser)
32-
t.setDaemon(True)
32+
t.daemon = True
3333
t.start()
3434

3535
if args.reload:

webware/Tests/TestEndToEnd/TestExamples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def removeDemoDatabase():
2929
sleep(.5)
3030
else:
3131
break
32-
sleep(.5)
32+
sleep(1)
3333

3434
def testStartPage(self):
3535
r = self.testApp.get('/')

0 commit comments

Comments
 (0)