Skip to content

Commit 4c426a5

Browse files
committed
Merge main and resolve conflicts in pyproject.toml
2 parents df952d9 + 1a1a01a commit 4c426a5

5 files changed

Lines changed: 85 additions & 1 deletion

File tree

CLAUDE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ Structure as: `init()` → `continue(id)` → `cleanup(id)`
128128
- Use descriptive IDs (runId, taskId)
129129
- Handle rate limits, timeouts, retries at system boundaries
130130

131+
## Git Workflow
132+
- **Protected Branch**: `main` is protected. Do not push directly to `main`. Use PRs.
133+
- **Merge Strategy**: Squash and merge.
134+
131135
## Deprecated
132136

133137
- Don't use `datetime.utcnow()` - use `datetime.now(timezone.utc)`

CONTRIBUTING.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Contributing
2+
3+
## Getting Started
4+
5+
1. **Prerequisites**:
6+
* Python >= 3.12
7+
* `uv` (for dependency management)
8+
9+
2. **Setup**:
10+
```bash
11+
make setup
12+
```
13+
14+
3. **Run Tests**:
15+
```bash
16+
make test
17+
```
18+
19+
## Development Workflow
20+
21+
1. Create a new branch for your feature/fix.
22+
2. Make your changes.
23+
3. Ensure code quality commands pass:
24+
```bash
25+
make ci
26+
```
27+
This runs formatting, linting, type checking, and dead code detection.
28+
29+
## Code Style
30+
31+
* Follow the existing conventions (snake_case for functions, CamelCase for classes).
32+
* Use `ruff` for linting and formatting (handled by `make fmt` and `make ruff`).
33+
* Add tests for new features.
34+
35+
## Pull Requests
36+
37+
* Keep PRs focused on a single change.
38+
* Update documentation if necessary.

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,12 @@ agents_validate: ## Validate AGENTS.md content
245245
@$(PYTHON) scripts/validate_agents_md.py
246246
@echo "$(GREEN)✅AGENTS.md validation completed.$(RESET)"
247247

248-
ci: ruff vulture import_lint ty docs_lint ## Run all CI checks (ruff, vulture, import_lint, ty, docs_lint)
248+
check_deps: install_tools ## Check for unused dependencies
249+
@echo "$(YELLOW)🔍Checking unused dependencies...$(RESET)"
250+
@uv run deptry .
251+
@echo "$(GREEN)✅Dependency check completed.$(RESET)"
252+
253+
ci: ruff vulture import_lint ty docs_lint check_deps ## Run all CI checks (ruff, vulture, import_lint, ty, docs_lint)
249254
@echo "$(GREEN)✅CI checks completed.$(RESET)"
250255

251256
########################################################

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies = [
2727
"pytest-cov>=7.0.0",
2828
"pytest-repeat>=0.9.4",
2929
"pylint>=3.3.0",
30+
"deptry>=0.24.0",
3031
"openfeature-sdk>=0.8.4",
3132
]
3233
readme = "README.md"

uv.lock

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)