Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test container to latest ubuntu #886

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
30 changes: 0 additions & 30 deletions python3/vimspector/gadgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
19 changes: 0 additions & 19 deletions support/test/python/simple_python/.vimspector.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
13 changes: 4 additions & 9 deletions tests/ci/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL C.UTF-8
Expand All @@ -24,12 +24,10 @@ 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 \
ca-cacert \
locales \
language-pack-en \
libncurses5-dev libncursesw5-dev \
Expand Down Expand Up @@ -58,15 +56,12 @@ 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

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
Expand Down
Loading