Skip to content

Commit c646453

Browse files
committed
Merge branch 'main' into kevin
2 parents 050537e + 689d3c9 commit c646453

414 files changed

Lines changed: 14838 additions & 7594 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/scripts/check_version_consistency.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
import os
33
import re
44
import sys
5-
from typing import Set, Tuple
65

76

8-
def find_version_references(directory: str) -> Tuple[Set[str], Set[str]]:
7+
def find_version_references(directory: str) -> tuple[set[str], set[str]]:
98
openhands_versions = set()
109
runtime_versions = set()
1110

.github/workflows/ghcr-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ jobs:
4141
# Only build nikolaik on PRs, otherwise build both nikolaik and ubuntu.
4242
if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
4343
json=$(jq -n -c '[
44-
{ image: "nikolaik/python-nodejs:python3.12-nodejs22", tag: "nikolaik" }
44+
{ image: "nikolaik/python-nodejs:python3.12-nodejs22", tag: "nikolaik" },
45+
{ image: "ubuntu:24.04", tag: "ubuntu" }
46+
4547
]')
4648
else
4749
json=$(jq -n -c '[

.github/workflows/py-unit-tests.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,28 @@ jobs:
5353
uses: codecov/codecov-action@v5
5454
env:
5555
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
56+
57+
# Run specific Windows python tests
58+
test-on-windows:
59+
name: Python Tests on Windows
60+
runs-on: windows-latest
61+
strategy:
62+
matrix:
63+
python-version: ['3.12']
64+
steps:
65+
- uses: actions/checkout@v4
66+
- name: Install pipx
67+
run: pip install pipx
68+
- name: Install poetry via pipx
69+
run: pipx install poetry
70+
- name: Set up Python
71+
uses: actions/setup-python@v5
72+
with:
73+
python-version: ${{ matrix.python-version }}
74+
cache: 'poetry'
75+
- name: Install Python dependencies using Poetry
76+
run: poetry install --without evaluation
77+
- name: Run Windows unit tests
78+
run: poetry run pytest -svv tests/unit/test_windows_bash.py
79+
- name: Run Windows runtime tests
80+
run: $env:TEST_RUNTIME="local"; poetry run pytest -svv tests/runtime/test_bash.py

.openhands/pre-commit.sh

100644100755
File mode changed.

Development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ poetry run pytest ./tests/unit/test_*.py
118118
To reduce build time (e.g., if no changes were made to the client-runtime component), you can use an existing Docker container image by
119119
setting the SANDBOX_RUNTIME_CONTAINER_IMAGE environment variable to the desired Docker image.
120120

121-
Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.36-nikolaik`
121+
Example: `export SANDBOX_RUNTIME_CONTAINER_IMAGE=ghcr.io/all-hands-ai/runtime:0.37-nikolaik`
122122

123123
## Develop inside Docker container
124124

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ system requirements and more information.
153153
154154

155155
```bash
156-
docker pull docker.all-hands.dev/all-hands-ai/runtime:0.36-nikolaik
156+
docker pull docker.all-hands.dev/all-hands-ai/runtime:0.37-nikolaik
157157

158158
docker run -it --rm --pull=always \
159-
-e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.36-nikolaik \
159+
-e SANDBOX_RUNTIME_CONTAINER_IMAGE=docker.all-hands.dev/all-hands-ai/runtime:0.37-nikolaik \
160160
-e LOG_ALL_EVENTS=true \
161161
-v /var/run/docker.sock:/var/run/docker.sock \
162162
-v ~/.openhands-state:/.openhands-state \
163163
-p 3000:3000 \
164164
--add-host host.docker.internal:host-gateway \
165165
--name openhands-app \
166-
docker.all-hands.dev/all-hands-ai/openhands:0.36
166+
docker.all-hands.dev/all-hands-ai/openhands:0.37
167167
```
168168

169169
You'll find OpenHands running at [http://localhost:3000](http://localhost:3000)!

containers/dev/compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- BACKEND_HOST=${BACKEND_HOST:-"0.0.0.0"}
1212
- SANDBOX_API_HOSTNAME=host.docker.internal
1313
#
14-
- SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.36-nikolaik}
14+
- SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-ghcr.io/all-hands-ai/runtime:0.37-nikolaik}
1515
- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234}
1616
- WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
1717
ports:

dev_config/python/.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v5.0.0
44
hooks:
55
- id: trailing-whitespace
66
exclude: docs/modules/python
@@ -10,17 +10,17 @@ repos:
1010
- id: debug-statements
1111

1212
- repo: https://github.com/tox-dev/pyproject-fmt
13-
rev: 1.7.0
13+
rev: v2.5.1
1414
hooks:
1515
- id: pyproject-fmt
1616
- repo: https://github.com/abravalheri/validate-pyproject
17-
rev: v0.16
17+
rev: v0.24.1
1818
hooks:
1919
- id: validate-pyproject
2020

2121
- repo: https://github.com/astral-sh/ruff-pre-commit
2222
# Ruff version.
23-
rev: v0.4.1
23+
rev: v0.11.8
2424
hooks:
2525
# Run the linter.
2626
- id: ruff
@@ -33,7 +33,7 @@ repos:
3333
types_or: [python, pyi, jupyter]
3434

3535
- repo: https://github.com/pre-commit/mirrors-mypy
36-
rev: v1.9.0
36+
rev: v1.15.0
3737
hooks:
3838
- id: mypy
3939
additional_dependencies:

dev_config/python/ruff.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ ignore = [
2020
"B010",
2121
"B904",
2222
"B018",
23+
# Temporarily ignore ASYNC rules until they can be properly fixed in a separate PR
24+
"ASYNC110",
25+
"ASYNC220",
26+
"ASYNC221",
27+
"ASYNC230",
28+
"ASYNC251",
2329
]
2430

2531
[lint.flake8-quotes]

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
image: openhands:latest
88
container_name: openhands-app-${DATE:-}
99
environment:
10-
- SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.36-nikolaik}
10+
- SANDBOX_RUNTIME_CONTAINER_IMAGE=${SANDBOX_RUNTIME_CONTAINER_IMAGE:-docker.all-hands.dev/all-hands-ai/runtime:0.37-nikolaik}
1111
#- SANDBOX_USER_ID=${SANDBOX_USER_ID:-1234} # enable this only if you want a specific non-root sandbox user but you will have to manually adjust permissions of openhands-state for this user
1212
- WORKSPACE_MOUNT_PATH=${WORKSPACE_BASE:-$PWD/workspace}
1313
ports:

0 commit comments

Comments
 (0)