Skip to content

Commit be95217

Browse files
authoredOct 18, 2023
update yarn.lock and python version (#469)
* update yarn.lock and python version * update requirements.txt * fix type errors * update flask socket io version and use apt instead of apt get * update install gdb command * set node env var to fix installation * set node env var to fix installation2 * fix typescript errors * run prettier * update pyinstaller version * update pex version
1 parent f869684 commit be95217

17 files changed

+1636
-1300
lines changed
 

‎.github/workflows/build_executable.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest, macos-latest]
16-
python-version: ["3.10"]
16+
python-version: ["3.12"]
1717
include:
1818
- os: ubuntu-latest
1919
buildname: linux

‎.github/workflows/tests.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest]
18-
python-version: ["3.10"]
18+
python-version: ["3.12"]
1919

2020
steps:
2121
- uses: actions/checkout@v2
@@ -29,7 +29,9 @@ jobs:
2929
pip install nox
3030
- name: Install gdb ubuntu
3131
run: |
32-
sudo apt-get install gdb
32+
sudo apt update
33+
sudo apt upgrade
34+
sudo apt install gdb
3335
- name: Execute Tests
3436
run: |
3537
nox --non-interactive --session tests-${{ matrix.python-version }}
@@ -39,7 +41,7 @@ jobs:
3941
strategy:
4042
matrix:
4143
os: [ubuntu-latest]
42-
python-version: ["3.10"]
44+
python-version: ["3.12"]
4345

4446
steps:
4547
- uses: actions/checkout@v2
@@ -78,7 +80,7 @@ jobs:
7880
- name: Set up Python
7981
uses: actions/setup-python@v2
8082
with:
81-
python-version: "3.10"
83+
python-version: "3.12"
8284
- name: Install dependencies
8385
run: |
8486
python -m pip install --upgrade pip

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ venv
1515
site
1616
gdbgui/static/js/*
1717
__pycache__
18+
.coverage*

‎.vscode/settings.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"python.formatting.provider": "black",
2+
"python.formatting.provider": "none",
33
"[python]": {
4-
"editor.formatOnSave": true
4+
"editor.formatOnSave": true,
5+
"editor.defaultFormatter": "ms-python.black-formatter"
56
},
67
"[json]": {
78
"editor.formatOnSave": true

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# gdbgui release history
22

3+
## 0.15.2.0
4+
- Update default python version to 3.12
5+
- utf-8 decode error bugfix
6+
- fix registers cannot be displayed bug
7+
38
## 0.15.1.0
49

510
- Compatibility with Werkzeug 2.1. Use the eventlet server instead of

‎docs/installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Note that this only applies if you are installing the Python package, and not us
8181

8282
### Linux Dependencies
8383

84-
sudo apt-get install gdb python3
84+
sudo apt install gdb python3
8585

8686
### macOS Dependencies
8787

‎gdbgui/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.15.1.0
1+
0.15.2.0

‎gdbgui/server/constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
pyinstaller_base_dir = getattr(sys, "_MEIPASS", None)
1212
using_pyinstaller = pyinstaller_base_dir is not None
1313
if using_pyinstaller:
14-
BASE_PATH = Path(pyinstaller_base_dir)
14+
BASE_PATH = Path(pyinstaller_base_dir or "")
1515
else:
1616
BASE_PATH = Path(os.path.realpath(__file__)).parent.parent
1717
PARENTDIR = BASE_PATH.parent

‎gdbgui/server/sessionmanager.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ def add_new_debug_session(
100100
pid = pty_for_gdb.pid
101101
debug_session = DebugSession(
102102
pygdbmi_controller=IoManager(
103-
os.fdopen(pty_for_gdbgui.stdin, mode="wb", buffering=0),
104-
os.fdopen(pty_for_gdbgui.stdout, mode="rb", buffering=0),
103+
os.fdopen(pty_for_gdbgui.stdin, mode="wb", buffering=0), # type: ignore
104+
os.fdopen(pty_for_gdbgui.stdout, mode="rb", buffering=0), # type: ignore
105105
None,
106106
),
107107
pty_for_gdbgui=pty_for_gdbgui,

‎gdbgui/src/js/ToolTip.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class ToolTip extends React.Component {
5959
border: "1px solid",
6060
position: "fixed",
6161
padding: "5px",
62-
// @ts-expect-error ts-migrate(2322) FIXME: Type '"121"' is not assignable to type '"-moz-init... Remove this comment to see the full error message
6362
zIndex: "121"
6463
}}
6564
>

‎gdbgui/src/js/ToolTipTourguide.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,13 @@ class ToolTipTourguide extends React.Component<{}, State> {
122122
background: "white",
123123
border: "1px solid",
124124
padding: "5px",
125-
// @ts-expect-error ts-migrate(2322) FIXME: Type '"1000"' is not assignable to type '"-moz-ini... Remove this comment to see the full error message
126125
zIndex: "1000",
127126
position: "absolute",
128127
overflow: "auto",
129128
whiteSpace: "normal",
130129
left: left,
131130
top: top,
132-
fontSize: "small",
133-
pointer: "normal"
131+
fontSize: "small"
134132
}}
135133
>
136134
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'content' does not exist on type 'Readonl... Remove this comment to see the full error message */}

‎noxfile.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
nox.options.reuse_existing_virtualenvs = True
1010
nox.options.sessions = ["tests", "lint", "docs"]
11-
python = ["3.11"]
11+
python = ["3.12"]
1212

1313
prettier_command = [
1414
"npx",
@@ -22,10 +22,10 @@
2222

2323
doc_dependencies = [".", "mkdocs", "mkdocs-material"]
2424
lint_dependencies = [
25-
"black==22.3.0",
25+
"black==22.10.0",
2626
"vulture",
2727
"flake8",
28-
"mypy==1.2.0",
28+
"mypy==1.6.1",
2929
"check-manifest",
3030
]
3131
vulture_whitelist = ".vulture_whitelist.py"
@@ -162,11 +162,11 @@ def publish_docs(session):
162162
session.run("mkdocs", "gh-deploy")
163163

164164

165-
@nox.session(reuse_venv=True, python="3.11")
165+
@nox.session(reuse_venv=True, python="3.12")
166166
def build_executables_current_platform(session):
167167
session.run("yarn", "install", external=True)
168168
session.run("yarn", "build", external=True)
169-
session.install(".", "PyInstaller==5.10.1")
169+
session.install(".", "PyInstaller==6.1")
170170
session.run("python", "make_executable.py")
171171
session.notify("build_pex")
172172

@@ -196,7 +196,7 @@ def build_executable_windows(session):
196196
def build_pex(session):
197197
"""Builds a pex of gdbgui"""
198198
# NOTE: frontend must be built before running this
199-
session.install("pex==2.1.93")
199+
session.install("pex")
200200
pex_path = Path("build/executable/gdbgui.pex")
201201
session.run(
202202
"pex",

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"version": "0.1.0",
44
"license": "GPL-3.0",
55
"scripts": {
6-
"start": "cross-env NODE_ENV=development webpack --mode development --watch --config webpack.config.js",
6+
"start": "cross-env NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=development webpack --mode development --watch --config webpack.config.js",
77
"test": "jest",
8-
"build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js",
8+
"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production webpack --mode production --config webpack.config.js",
99
"format": "prettier ./gdbgui/src/js/** --write",
1010
"lint": "prettier ./gdbgui/src/js/** --check"
1111
},
@@ -44,4 +44,4 @@
4444
"webpack": "4.19.0",
4545
"webpack-cli": "^2.0.14"
4646
}
47-
}
47+
}

‎requirements.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask-SocketIO>5.1, <5.2
1+
Flask-SocketIO>5.3, <6
22
Flask-Compress>1.10, <1.11
33
pygdbmi>=0.10.0.2, <0.11
44
Pygments>=2.2.0, <3.0

‎requirements.txt

+19-13
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,53 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile requirements.in
5+
# pip-compile
66
#
77
bidict==0.22.1
88
# via python-socketio
9-
blinker==1.6.2
9+
blinker==1.6.3
1010
# via flask
11-
brotli==1.0.9
11+
brotli==1.1.0
1212
# via flask-compress
13-
click==8.1.3
13+
click==8.1.7
1414
# via flask
15-
dnspython==2.3.0
15+
dnspython==2.4.2
1616
# via eventlet
1717
eventlet==0.33.3
1818
# via -r requirements.in
19-
flask==2.3.2
19+
flask==3.0.0
2020
# via
2121
# flask-compress
2222
# flask-socketio
2323
flask-compress==1.10.1
2424
# via -r requirements.in
25-
flask-socketio==5.1.2
25+
flask-socketio==5.3.6
2626
# via -r requirements.in
27-
greenlet==2.0.2
27+
greenlet==3.0.0
2828
# via eventlet
29+
h11==0.14.0
30+
# via wsproto
2931
itsdangerous==2.1.2
3032
# via flask
3133
jinja2==3.1.2
3234
# via flask
33-
markupsafe==2.1.2
35+
markupsafe==2.1.3
3436
# via
3537
# jinja2
3638
# werkzeug
3739
pygdbmi==0.10.0.2
3840
# via -r requirements.in
39-
pygments==2.15.1
41+
pygments==2.16.1
4042
# via -r requirements.in
41-
python-engineio==4.4.1
43+
python-engineio==4.8.0
4244
# via python-socketio
43-
python-socketio==5.8.0
45+
python-socketio==5.10.0
4446
# via flask-socketio
47+
simple-websocket==1.0.0
48+
# via python-engineio
4549
six==1.16.0
4650
# via eventlet
47-
werkzeug==2.3.4
51+
werkzeug==3.0.0
4852
# via flask
53+
wsproto==1.2.0
54+
# via simple-websocket

‎setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22

33
import os
4-
import distutils.text_file
4+
import distutils.text_file # type: ignore
55

66
USING_WINDOWS = os.name == "nt"
77
if USING_WINDOWS:
@@ -70,7 +70,6 @@
7070
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
7171
"Programming Language :: Python",
7272
"Programming Language :: Python :: 3",
73-
"Programming Language :: Python :: 3.9",
7473
],
7574
python_requires=">=3.6",
7675
project_urls={

‎yarn.lock

+1,584-1,259
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.