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

feat (WIP): adding a more performant resolve #158

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
- name: Install Poetry
uses: snok/install-poetry@v1

- name: Install maturin
run: pip install maturin

- name: Copy environment file
run: cp .env.sample .env

Expand Down
72 changes: 37 additions & 35 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
name: docs
on:
push:
branches:
- master
- main
permissions:
contents: write
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Configure Git Credentials
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Install Poetry
uses: snok/install-poetry@v1
- name: Copy environment file
run: cp .env.sample .env
- name: Install dependencies
run: make install
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
- uses: actions/cache@v4
with:
key: mkdocs-material-${{ env.cache_id }}
path: .cache
restore-keys: |
mkdocs-material-
- run: poetry run mkdocs build
- run: poetry run mkdocs gh-deploy --force
name: docs
on:
push:
branches:
- master
- main
permissions:
contents: write
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Configure Git Credentials
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Install Poetry
uses: snok/install-poetry@v1
- name: Install maturin
run: pip install maturin
- name: Copy environment file
run: cp .env.sample .env
- name: Install dependencies
run: make install
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
- uses: actions/cache@v4
with:
key: mkdocs-material-${{ env.cache_id }}
path: .cache
restore-keys: |
mkdocs-material-
- run: poetry run mkdocs build
- run: poetry run mkdocs gh-deploy --force
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,7 @@ website/.vercel

# typescript
website/*.tsbuildinfo
website/next-env.d.ts
website/next-env.d.ts

# Rust
*target/
31 changes: 24 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,24 +1,41 @@
# Load environment variables from .env file
include .env

.PHONY: tests tests-basic lint install mypy update ui-install ui-run
.PHONY: tests tests-basic lint install mypy update ui-install ui-run build-rust develop clean

# Build commands
build-rust:
maturin develop --release --manifest-path docetl/rust/Cargo.toml

develop: clean build-rust
poetry install --all-extras

clean:
rm -rf target/
rm -rf docetl/rust/target/
rm -f docetl/resolver/resolver*.so
find . -type d -name "__pycache__" -exec rm -rf {} +
find . -type f -name "*.pyc" -delete
find . -type f -name "*.pyo" -delete
find . -type f -name "*.so" -delete

# Install command now includes Rust build
install: clean
pip install poetry maturin
$(MAKE) develop

# Existing commands
tests:
tests: clean build-rust
poetry run pytest

tests-basic:
tests-basic: clean build-rust
poetry run pytest tests/basic
poetry run pytest tests/test_api.py
poetry run pytest tests/test_runner_caching.py

lint:
poetry run ruff check docetl/* --fix

install:
pip install poetry
poetry install --all-extras

mypy:
poetry run mypy

Expand Down
Loading
Loading