Skip to content

Commit

Permalink
update yarn.lock and python version (#469)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
cs01 authored Oct 18, 2023
1 parent f869684 commit be95217
Show file tree
Hide file tree
Showing 17 changed files with 1,636 additions and 1,300 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_executable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.10"]
python-version: ["3.12"]
include:
- os: ubuntu-latest
buildname: linux
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.10"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v2
Expand All @@ -29,7 +29,9 @@ jobs:
pip install nox
- name: Install gdb ubuntu
run: |
sudo apt-get install gdb
sudo apt update
sudo apt upgrade
sudo apt install gdb
- name: Execute Tests
run: |
nox --non-interactive --session tests-${{ matrix.python-version }}
Expand All @@ -39,7 +41,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.10"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -78,7 +80,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ venv
site
gdbgui/static/js/*
__pycache__
.coverage*
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"python.formatting.provider": "black",
"python.formatting.provider": "none",
"[python]": {
"editor.formatOnSave": true
"editor.formatOnSave": true,
"editor.defaultFormatter": "ms-python.black-formatter"
},
"[json]": {
"editor.formatOnSave": true
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# gdbgui release history

## 0.15.2.0
- Update default python version to 3.12
- utf-8 decode error bugfix
- fix registers cannot be displayed bug

## 0.15.1.0

- Compatibility with Werkzeug 2.1. Use the eventlet server instead of
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Note that this only applies if you are installing the Python package, and not us

### Linux Dependencies

sudo apt-get install gdb python3
sudo apt install gdb python3

### macOS Dependencies

Expand Down
2 changes: 1 addition & 1 deletion gdbgui/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.15.1.0
0.15.2.0
2 changes: 1 addition & 1 deletion gdbgui/server/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
pyinstaller_base_dir = getattr(sys, "_MEIPASS", None)
using_pyinstaller = pyinstaller_base_dir is not None
if using_pyinstaller:
BASE_PATH = Path(pyinstaller_base_dir)
BASE_PATH = Path(pyinstaller_base_dir or "")
else:
BASE_PATH = Path(os.path.realpath(__file__)).parent.parent
PARENTDIR = BASE_PATH.parent
Expand Down
4 changes: 2 additions & 2 deletions gdbgui/server/sessionmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def add_new_debug_session(
pid = pty_for_gdb.pid
debug_session = DebugSession(
pygdbmi_controller=IoManager(
os.fdopen(pty_for_gdbgui.stdin, mode="wb", buffering=0),
os.fdopen(pty_for_gdbgui.stdout, mode="rb", buffering=0),
os.fdopen(pty_for_gdbgui.stdin, mode="wb", buffering=0), # type: ignore
os.fdopen(pty_for_gdbgui.stdout, mode="rb", buffering=0), # type: ignore
None,
),
pty_for_gdbgui=pty_for_gdbgui,
Expand Down
1 change: 0 additions & 1 deletion gdbgui/src/js/ToolTip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ class ToolTip extends React.Component {
border: "1px solid",
position: "fixed",
padding: "5px",
// @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
zIndex: "121"
}}
>
Expand Down
4 changes: 1 addition & 3 deletions gdbgui/src/js/ToolTipTourguide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,13 @@ class ToolTipTourguide extends React.Component<{}, State> {
background: "white",
border: "1px solid",
padding: "5px",
// @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
zIndex: "1000",
position: "absolute",
overflow: "auto",
whiteSpace: "normal",
left: left,
top: top,
fontSize: "small",
pointer: "normal"
fontSize: "small"
}}
>
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'content' does not exist on type 'Readonl... Remove this comment to see the full error message */}
Expand Down
12 changes: 6 additions & 6 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

nox.options.reuse_existing_virtualenvs = True
nox.options.sessions = ["tests", "lint", "docs"]
python = ["3.11"]
python = ["3.12"]

prettier_command = [
"npx",
Expand All @@ -22,10 +22,10 @@

doc_dependencies = [".", "mkdocs", "mkdocs-material"]
lint_dependencies = [
"black==22.3.0",
"black==22.10.0",
"vulture",
"flake8",
"mypy==1.2.0",
"mypy==1.6.1",
"check-manifest",
]
vulture_whitelist = ".vulture_whitelist.py"
Expand Down Expand Up @@ -162,11 +162,11 @@ def publish_docs(session):
session.run("mkdocs", "gh-deploy")


@nox.session(reuse_venv=True, python="3.11")
@nox.session(reuse_venv=True, python="3.12")
def build_executables_current_platform(session):
session.run("yarn", "install", external=True)
session.run("yarn", "build", external=True)
session.install(".", "PyInstaller==5.10.1")
session.install(".", "PyInstaller==6.1")
session.run("python", "make_executable.py")
session.notify("build_pex")

Expand Down Expand Up @@ -196,7 +196,7 @@ def build_executable_windows(session):
def build_pex(session):
"""Builds a pex of gdbgui"""
# NOTE: frontend must be built before running this
session.install("pex==2.1.93")
session.install("pex")
pex_path = Path("build/executable/gdbgui.pex")
session.run(
"pex",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.1.0",
"license": "GPL-3.0",
"scripts": {
"start": "cross-env NODE_ENV=development webpack --mode development --watch --config webpack.config.js",
"start": "cross-env NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=development webpack --mode development --watch --config webpack.config.js",
"test": "jest",
"build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js",
"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production webpack --mode production --config webpack.config.js",
"format": "prettier ./gdbgui/src/js/** --write",
"lint": "prettier ./gdbgui/src/js/** --check"
},
Expand Down Expand Up @@ -44,4 +44,4 @@
"webpack": "4.19.0",
"webpack-cli": "^2.0.14"
}
}
}
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flask-SocketIO>5.1, <5.2
Flask-SocketIO>5.3, <6
Flask-Compress>1.10, <1.11
pygdbmi>=0.10.0.2, <0.11
Pygments>=2.2.0, <3.0
Expand Down
32 changes: 19 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,53 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile requirements.in
# pip-compile
#
bidict==0.22.1
# via python-socketio
blinker==1.6.2
blinker==1.6.3
# via flask
brotli==1.0.9
brotli==1.1.0
# via flask-compress
click==8.1.3
click==8.1.7
# via flask
dnspython==2.3.0
dnspython==2.4.2
# via eventlet
eventlet==0.33.3
# via -r requirements.in
flask==2.3.2
flask==3.0.0
# via
# flask-compress
# flask-socketio
flask-compress==1.10.1
# via -r requirements.in
flask-socketio==5.1.2
flask-socketio==5.3.6
# via -r requirements.in
greenlet==2.0.2
greenlet==3.0.0
# via eventlet
h11==0.14.0
# via wsproto
itsdangerous==2.1.2
# via flask
jinja2==3.1.2
# via flask
markupsafe==2.1.2
markupsafe==2.1.3
# via
# jinja2
# werkzeug
pygdbmi==0.10.0.2
# via -r requirements.in
pygments==2.15.1
pygments==2.16.1
# via -r requirements.in
python-engineio==4.4.1
python-engineio==4.8.0
# via python-socketio
python-socketio==5.8.0
python-socketio==5.10.0
# via flask-socketio
simple-websocket==1.0.0
# via python-engineio
six==1.16.0
# via eventlet
werkzeug==2.3.4
werkzeug==3.0.0
# via flask
wsproto==1.2.0
# via simple-websocket
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

import os
import distutils.text_file
import distutils.text_file # type: ignore

USING_WINDOWS = os.name == "nt"
if USING_WINDOWS:
Expand Down Expand Up @@ -70,7 +70,6 @@
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
],
python_requires=">=3.6",
project_urls={
Expand Down
Loading

0 comments on commit be95217

Please sign in to comment.