From 71a28ccabd49960c8ea41e6f03f004a45e33d726 Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 8 Oct 2024 23:49:07 +0100 Subject: [PATCH 1/3] Upgrade test container to Ubuntu 22.04 --- tests/ci/image/Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/ci/image/Dockerfile b/tests/ci/image/Dockerfile index 036059ac..812923c6 100644 --- a/tests/ci/image/Dockerfile +++ b/tests/ci/image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive ENV LC_ALL C.UTF-8 @@ -24,8 +24,7 @@ RUN apt-get update && \ > /etc/apt/sources.list.d/nodesource.list && \ apt-get update && \ apt-get -y dist-upgrade && \ - apt-get -y install gcc-8 \ - g++-8 \ + apt-get -y install build-essential \ python3-dev \ python3-pip \ python3-venv \ @@ -64,9 +63,6 @@ RUN apt-get update && \ RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime && \ dpkg-reconfigure --frontend noninteractive tzdata -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 1 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-8 - RUN curl -LO https://golang.org/dl/go${GOVERSION}.linux-${GOARCH}.tar.gz && \ tar -C /usr/local -xzvf go${GOVERSION}.linux-${GOARCH}.tar.gz && \ update-alternatives --install /usr/local/bin/go go /usr/local/go/bin/go 1 From fc0a75d4f6e26cb3c3a5767bba953fd994faea9a Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Wed, 9 Oct 2024 00:04:02 +0100 Subject: [PATCH 2/3] Remove legacy python2 support --- README.md | 27 +---------------- python3/vimspector/gadgets.py | 30 ------------------- .../python/simple_python/.vimspector.json | 19 ------------ 3 files changed, 1 insertion(+), 75 deletions(-) diff --git a/README.md b/README.md index f379c36a..61bb599d 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,6 @@ For detailed explanation of the `.vimspector.json` format, see the * [Python](#python) * [Python Remote Debugging](#python-remote-debugging) * [Python Remote launch and attach](#python-remote-launch-and-attach) - * [Python 2](#python-2) * [TCL](#tcl) * [C♯](#c) * [Go](#go) @@ -186,7 +185,6 @@ runtime dependencies). They are categorised by their level of support: | C# (dotnet core) | Tested | `--force-enable-csharp` | netcoredbg | DotNet core | | F#, VB, etc. | Supported | `--force-enable-[fsharp,vbnet]` | netcoredbg | DotNet core | | Go (legacy) | Legacy | `--enable-go` | vscode-go | Node, Go, [Delve][] | -| Python 2 | Legacy | `--force-enable-python2` | debugpy-python2 | Python 2.7 | ## Other languages @@ -1834,9 +1832,7 @@ Example: * Install with `install_gadget.py --enable-python` or `:VimspectorInstall debugpy`, ideally requires a working compiler and the python development headers/libs to build a C python extension for performance. -* ***NOTE***: Debugpy no longer supports python 2. In order to continue to debug - python 2 applications, use the `debugpy-python2` adapter after installing the - `debugpy-python2` gadget. +* ***NOTE***: Debugpy no longer supports python 2. * Full options: https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings @@ -1908,27 +1904,6 @@ debugpy](https://github.com/microsoft/debugpy/wiki/Debugging-over-SSH). If you're feeling fancy, checkout the [reference guide][remote-debugging] for an example of getting Vimspector to remotely launch and attach. -### Python 2 - -In order to continue to debug python 2 applications, ensure that you install the -`debugpy-python2` gadget (e.g. `--force-enable-python2` or -`:VimspectorInstall debugpy-python2`), and then change your configuration to -use: - -```json -{ - "configurations": { - "Python Attach": { - "adapter": "debugpy-python2", - // ... - } - } -} - -``` - -for examk - ## TCL * TCL (TclProDebug) diff --git a/python3/vimspector/gadgets.py b/python3/vimspector/gadgets.py index a84f7f7d..4b291414 100644 --- a/python3/vimspector/gadgets.py +++ b/python3/vimspector/gadgets.py @@ -134,36 +134,6 @@ } }, }, - 'debugpy-python2': { - 'language': 'python2', - 'enabled': False, - 'download': { - 'url': 'https://github.com/microsoft/debugpy/archive/${file_name}' - }, - 'all': { - # Don't update - this is the last version that supports python2 - 'version': '1.5.1', - 'file_name': 'v1.5.1.zip', - 'checksum': - '00cf8235b88880bc2d8f59e8f6585208a43e6f14017cdf11d3a0bb2aeb4fff79' - }, - 'do': lambda name, root, gadget: installer.InstallDebugpy( name, - root, - gadget ), - 'adapters': { - 'debugpy-python2': { - "command": [ - sys.executable, - "${gadgetDir}/debugpy-python2/build/lib/debugpy/adapter" - ], - "name": "debugpy", - "configuration": { - "python": sys.executable - }, - 'custom_handler': 'vimspector.custom.python.Debugpy' - } - }, - }, 'vscode-java-debug': { 'language': 'java', 'enabled': False, diff --git a/support/test/python/simple_python/.vimspector.json b/support/test/python/simple_python/.vimspector.json index ce0bd7ee..3ee21d40 100644 --- a/support/test/python/simple_python/.vimspector.json +++ b/support/test/python/simple_python/.vimspector.json @@ -137,25 +137,6 @@ "console": "integratedTerminal" } }, - "run - debugpy-python2": { - "adapter": "debugpy-python2", - "configuration": { - "request": "launch", - "python": "${pathToPython:python}", - "type": "python", - "cwd": "${workspaceRoot}", - "program": "${file}", - "stopOnEntry": false, - "console": "integratedTerminal" - }, - "breakpoints": { - "exception": { - "raised": "N", - "uncaught": "", - "userUnhandled": "" - } - } - }, "run - debugpy-custom-python": { "adapter": "debugpy", "configuration": { From 798e3fc46254d82b7cafc4385dd4d676856c8fe0 Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Wed, 9 Oct 2024 00:04:22 +0100 Subject: [PATCH 3/3] Upgrade test container to Ubuntu 24.04 --- tests/ci/image/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/ci/image/Dockerfile b/tests/ci/image/Dockerfile index 812923c6..b8106799 100644 --- a/tests/ci/image/Dockerfile +++ b/tests/ci/image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND=noninteractive ENV LC_ALL C.UTF-8 @@ -28,7 +28,6 @@ RUN apt-get update && \ python3-dev \ python3-pip \ python3-venv \ - ca-cacert \ locales \ language-pack-en \ libncurses5-dev libncursesw5-dev \ @@ -57,8 +56,8 @@ RUN apt-get update && \ curl && \ apt-get -y autoremove && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - pip3 install neovim && \ - pip install "git+https://github.com/puremourning/asciinema@exit_code#egg=asciinema" + pip3 install --break-system-packages neovim && \ + pip3 install --break-system-packages "git+https://github.com/puremourning/asciinema@exit_code#egg=asciinema" RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime && \ dpkg-reconfigure --frontend noninteractive tzdata