Skip to content

Commit

Permalink
Merge pull request #725 from philipdp123/bottle-websocket-fix
Browse files Browse the repository at this point in the history
Fix WebSocket import error for Python 3.12 compatibility
  • Loading branch information
samuelhwilliams authored Jul 11, 2024
2 parents a589ad0 + 3926a09 commit e803ae8
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-latest, macos-latest]
python-version: [3.7, 3.8, 3.9, "3.10"]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
exclude:
- os: macos-latest
python-version: 3.7
Expand Down
5 changes: 4 additions & 1 deletion eel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
import gevent as gvt
import json as jsn
import bottle as btl
import bottle.ext.websocket as wbs
try:
import bottle_websocket as wbs
except ImportError:
import bottle.ext.websocket as wbs
import re as rgx
import os
import eel.browsers as brw
Expand Down
1 change: 1 addition & 0 deletions requirements-meta.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ tox>=3.15.2,<4.0.0
tox-pyenv==1.1.0
tox-gh-actions==2.0.0
virtualenv>=16.7.10
setuptools
10 changes: 5 additions & 5 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.[jinja2]

psutil==5.9.2
pytest==7.0.1
pytest-timeout==2.1.0
psutil>=5.0.0,<6.0.0
pytest>=7.0.0,<8.0.0
pytest-timeout>=2.0.0,<3.0.0
selenium>=4.0.0,<5.0.0
webdriver_manager>=4.0.0,<5.0.0
mypy==0.971
pyinstaller==4.10
types-setuptools==67.2.0.1
pyinstaller
types-setuptools
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = typecheck,py{37,38,39,310}
envlist = typecheck,py{37,38,39,310,311,312}

[pytest]
timeout = 30
Expand All @@ -10,6 +10,9 @@ python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311
3.12: py312


[testenv]
description = run py.test tests
Expand Down

0 comments on commit e803ae8

Please sign in to comment.