Skip to content

Commit 8fab0be

Browse files
chrisdpurcellclaude
andcommitted
merge: integrate testing branch into main (unrelated histories)
All conflicts resolved in favour of testing — testing contains the complete TextTools v0.2.0 implementation. main previously held only 3 initial setup commits from a separate bootstrap. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2 parents 56db8ab + 2019c5b commit 8fab0be

33 files changed

Lines changed: 8036 additions & 1671 deletions

.github/workflows/ci.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,56 @@ name: CI
22

33
on:
44
push:
5-
branches: [ main, develop ]
5+
branches: [ main, testing ]
66
pull_request:
7-
branches: [ main, develop ]
7+
branches: [ main ]
88

99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Set up Python 3.14
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: '3.14'
2020

21+
- name: Install uv
22+
run: pip install uv
23+
2124
- name: Install dependencies
22-
run: |
23-
python -m pip install --upgrade pip
24-
pip install -r requirements.txt
25+
run: uv pip install --system -r requirements.txt
2526

2627
- name: Run tests
27-
run: |
28-
pytest tests/ -v --cov=src --cov-report=xml
28+
run: pytest tests/ -v --cov=src --cov-report=xml
2929

3030
- name: Upload coverage to Codecov
31-
uses: codecov/codecov-action@v3
31+
uses: codecov/codecov-action@v4
3232
with:
3333
file: ./coverage.xml
3434
flags: unittests
35-
name: codecov-umbrella
3635
fail_ci_if_error: false
3736

3837
lint:
3938
runs-on: ubuntu-latest
4039

4140
steps:
42-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4342

44-
- name: Set up Python
45-
uses: actions/setup-python@v4
43+
- name: Set up Python 3.14
44+
uses: actions/setup-python@v5
4645
with:
4746
python-version: '3.14'
4847

48+
- name: Install uv
49+
run: pip install uv
50+
4951
- name: Install dependencies
5052
run: |
51-
python -m pip install --upgrade pip
52-
pip install black isort mypy pylint
53-
pip install -r requirements.txt
53+
uv pip install --system black isort mypy
54+
uv pip install --system -r requirements.txt
5455
5556
- name: Check formatting with black
5657
run: black --check src/ tests/
@@ -60,8 +61,3 @@ jobs:
6061

6162
- name: Type check with mypy
6263
run: mypy src/
63-
continue-on-error: true
64-
65-
- name: Lint with pylint
66-
run: pylint src/
67-
continue-on-error: true

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,3 +205,13 @@ cython_debug/
205205
marimo/_static/
206206
marimo/_lsp/
207207
__marimo__/
208+
209+
# Claude Code / AI tool configs — may contain API keys
210+
.mcp.json
211+
.mcp.json.*
212+
.codex/
213+
214+
# Internal tool configs — not for public consumption
215+
.contextstream/
216+
setup-branch-protection.sh
217+
.github/agents/

0 commit comments

Comments
 (0)