Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into shorter-context-win…
Browse files Browse the repository at this point in the history
…dow-option
  • Loading branch information
ryx2 committed Nov 16, 2024
2 parents 1fd916c + 97f3249 commit 8e74a08
Show file tree
Hide file tree
Showing 23 changed files with 179 additions and 1,265 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/lint-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -43,7 +44,7 @@ jobs:
run: pip install pre-commit==3.7.0
- name: Fix python lint issues
run: |
pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --config ./dev_config/python/.pre-commit-config.yaml --all-files
pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --config ./dev_config/python/.pre-commit-config.yaml
# Commit and push changes if any
- name: Check for changes
Expand Down
1 change: 1 addition & 0 deletions frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export default defineConfig(({ mode }) => {
test: {
environment: "jsdom",
setupFiles: ["vitest.setup.ts"],
reporters: "basic",
exclude: [...configDefaults.exclude, "tests"],
coverage: {
reporter: ["text", "json", "html", "lcov", "text-summary"],
Expand Down
2 changes: 1 addition & 1 deletion frontend/vitest.setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ vi.mock("react-i18next", async (importOriginal) => ({
}));

// Mock requests during tests
beforeAll(() => server.listen());
beforeAll(() => server.listen({ onUnhandledRequest: "bypass" }));
afterEach(() => {
server.resetHandlers();
// Cleanup the document body after each test
Expand Down
8 changes: 5 additions & 3 deletions openhands/linter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Linter module for OpenHands.
Part of this Linter module is adapted from Aider (Apache 2.0 License, [original code](https://github.com/paul-gauthier/aider/blob/main/aider/linter.py)). Please see the [original repository](https://github.com/paul-gauthier/aider) for more information.
Part of this Linter module is adapted from Aider (Apache 2.0 License, [original
code](https://github.com/paul-gauthier/aider/blob/main/aider/linter.py)).
- Please see the [original repository](https://github.com/paul-gauthier/aider) for more information.
- The detailed implementation of the linter can be found at: https://github.com/All-Hands-AI/openhands-aci.
"""

from openhands.linter.base import LintResult
from openhands.linter.linter import DefaultLinter
from openhands_aci.linter import DefaultLinter, LintResult

__all__ = ['DefaultLinter', 'LintResult']
79 changes: 0 additions & 79 deletions openhands/linter/base.py

This file was deleted.

98 changes: 0 additions & 98 deletions openhands/linter/languages/python.py

This file was deleted.

74 changes: 0 additions & 74 deletions openhands/linter/languages/treesitter.py

This file was deleted.

Loading

0 comments on commit 8e74a08

Please sign in to comment.