Skip to content

Commit 73f2ba9

Browse files
RobinPicardrlouf
authored andcommitted
Revert "Merge v1.0 into main (#1619)"
This reverts commit 7fc5f1c.
1 parent 7fc5f1c commit 73f2ba9

File tree

300 files changed

+12037
-21850
lines changed

Some content is hidden

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

300 files changed

+12037
-21850
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tests
22

33
on:
44
pull_request:
5-
branches: [main,v1.0]
5+
branches: [main]
66
push:
77
branches: [main]
88

@@ -29,11 +29,6 @@ jobs:
2929
uses: actions/setup-python@v4
3030
with:
3131
python-version: ${{ matrix.python-version }}
32-
- name: Install Ollama
33-
run: |
34-
curl -fsSL https://ollama.com/install.sh | sh
35-
ollama --version
36-
ollama pull tinyllama
3732
- name: Set up test environment
3833
run: |
3934
python -m pip install --upgrade pip
@@ -51,7 +46,7 @@ jobs:
5146
echo "::set-output name=id::$MATRIX_ID"
5247
- name: Run tests
5348
run: |
54-
uv run pytest -x --cov=outlines -m 'not api_call'
49+
uv run pytest -x --cov=outlines
5550
env:
5651
COVERAGE_FILE: .coverage.${{ steps.matrix-id.outputs.id }}
5752
- name: Upload coverage data
@@ -87,30 +82,16 @@ jobs:
8782
with:
8883
name: coverage-data
8984

90-
- name: Determine base branch for comparison
91-
id: base-branch
92-
run: |
93-
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
94-
# For PRs, use the remote tracking branch
95-
COMPARE_BRANCH="origin/${{ github.base_ref }}"
96-
echo "COMPARE_BRANCH=$COMPARE_BRANCH" >> $GITHUB_ENV
97-
else
98-
# For push events, compare against the parent commit
99-
COMPARE_BRANCH="${{ github.event.before }}"
100-
echo "COMPARE_BRANCH=$COMPARE_BRANCH" >> $GITHUB_ENV
101-
fi
102-
echo "Using $COMPARE_BRANCH for coverage comparison"
103-
104-
- name: Fetch base branch for coverage diff
85+
- name: Fetch main for coverage diff
10586
run: |
106-
git fetch --no-tags --prune origin ${COMPARE_BRANCH#origin/}
87+
git fetch --no-tags --prune origin main
10788
10889
- name: Combine coverage & fail if it's <100%.
10990
run: |
11091
python -m coverage combine
11192
python -m coverage html --skip-covered --skip-empty
11293
python -m coverage xml
113-
diff-cover coverage.xml --compare-branch=$COMPARE_BRANCH --markdown-report=coverage.md --fail-under=100 || (cat coverage.md >> $GITHUB_STEP_SUMMARY && exit 1)
94+
diff-cover coverage.xml --markdown-report=coverage.md --fail-under=100 || (cat coverage.md >> $GITHUB_STEP_SUMMARY && exit 1)
11495
11596
- name: Upload HTML report if check failed.
11697
uses: actions/upload-artifact@v4

.github/workflows/tests_nightly.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

Dockerfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
### Build stage
2+
FROM python:3.10 AS builder
3+
4+
WORKDIR /outlines
5+
6+
RUN pip install --upgrade pip
7+
8+
# Copy necessary build components
9+
COPY pyproject.toml .
10+
COPY outlines ./outlines
11+
12+
# Install outlines and outlines[serve]
13+
# .git required by setuptools-scm
14+
RUN --mount=source=.git,target=.git,type=bind \
15+
pip install --no-cache-dir .[serve]
16+
17+
### Runtime stage
18+
FROM python:3.10
19+
WORKDIR /outlines
20+
COPY --from=builder /outlines /outlines
21+
22+
# https://dottxt-ai.github.io/outlines/reference/vllm/
23+
ENTRYPOINT ["python3", "-m", "outlines.serve.serve"]

0 commit comments

Comments
 (0)