dev: Refactor CI and other stuff

.github/workflows/ci.yml: 

.gitignore: 
AGENTS.md: 
Justfile: 
Makefile: 
crates/codetracer-python-recorder/Cargo.lock: 
flake.nix: 
pyproject.toml: 
src/codetracer_pure_python_recorder/__init__.py: 
src/codetracer_pure_python_recorder/cli.py: 

Signed-off-by: Tzanko Matev <[email protected]>

Author: tzanko-matev

.github/workflows/ci.yml

@@ -15,15 +15,12 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
-      - name: Install make on Windows
-        if: runner.os == 'Windows'
-        run: choco install make -y
       - uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Run tests
         shell: bash
-        run: make test
+        run: python -m unittest discover -v
 
   nix-tests:
     runs-on: ubuntu-latest
@@ -35,4 +32,24 @@ jobs:
           extra_nix_config: |
             experimental-features = nix-command flakes
       - name: Run tests via Nix
-        run: nix develop --command make test
+        run: nix develop --command just test
+
+  rust-smoke:
+    name: Rust module smoke test on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - uses: messense/maturin-action@v1
+        with:
+          command: build
+          args: -m crates/codetracer-python-recorder/Cargo.toml --release
+      - name: Install built wheel
+        run: python -m pip install --upgrade pip && python -m pip install target/wheels/*.whl
+      - name: Import smoke test
+        run: python -c "import codetracer_python_recorder as m; print(m.hello())"

.gitignore

@@ -1,3 +1,5 @@
 .direnv/
 **/__pycache__/
 .aider*
+.venv/
+**/target/

AGENTS.md

@@ -8,14 +8,16 @@ This repository contains two related projects:
 To run the Python test suite for the pure-Python tracer, execute:
 
 ```
-make test
+just test
 ```
 
 The tester executes a number of sample programs in `tests/programs` and compares their outputs to the fixtures in `tests/fixtures`.
 
 To build and locally develop-install the Rust-backed module:
 
 ```
+just build-rust
+# or:
 maturin develop -m crates/codetracer-python-recorder/Cargo.toml
 ```
 

Justfile

@@ -0,0 +1,26 @@
+# Development helpers for the monorepo
+
+# Print toolchain versions to verify the dev environment
+env:
+    python3 --version
+    cargo --version
+    rustc --version
+    maturin --version
+
+# Create a local virtualenv for Python tooling
+venv:
+    test -d .venv || python3 -m venv .venv
+    .venv/bin/python -m pip install -U pip
+
+# Build and develop-install the Rust-backed Python module
+build-rust:
+    test -d .venv || python3 -m venv .venv
+    VIRTUAL_ENV=.venv maturin develop -m crates/codetracer-python-recorder/Cargo.toml
+
+# Smoke test the Rust module after build
+smoke-rust:
+    .venv/bin/python -c "import codetracer_python_recorder as m; print(m.hello())"
+
+# Run the Python test suite for the pure-Python recorder
+test:
+    python3 -m unittest discover -v

Makefile

@@ -1,4 +1,4 @@
+# This Makefile is deprecated. Use 'just test' instead.
 .PHONY: test
-
 test:
-	python3 -m unittest discover -v
+	@echo "Deprecated: Use 'just test' instead." && false

crates/codetracer-python-recorder/Cargo.lock

@@ -11,4 +11,4 @@ name = "codetracer_python_recorder"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.21", features = ["extension-module"] }
+pyo3 = { version = "0.25.1", features = ["extension-module"] }

crates/codetracer-python-recorder/Cargo.toml

@@ -10,7 +10,8 @@ fn hello() -> PyResult<String> {
 }
 
 #[pymodule]
-fn codetracer_python_recorder(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
-    m.add_function(wrap_pyfunction!(hello, m)?)?;
+fn codetracer_python_recorder(_py: Python<'_>, m: Bound<'_, PyModule>) -> PyResult<()> {
+    let hello_fn = wrap_pyfunction!(hello, &m)?;
+    m.add_function(hello_fn)?;
     Ok(())
 }

crates/codetracer-python-recorder/src/lib.rs

@@ -18,6 +18,11 @@
               just
               git-lfs
 
+              # Linters and type checkers for Python code
+              ruff
+              black
+              mypy
+
               # Rust toolchain for the Rust-backed Python module
               cargo
               rustc

flake.nix

@@ -3,9 +3,9 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "codetracer-python-recorder"
+name = "codetracer-pure-python-recorder"
 version = "0.1.0"
-description = "Prototype recorder of Python programs producing CodeTracer traces"
+description = "Pure-Python prototype recorder producing CodeTracer traces"
 authors = [{name = "Metacraft Labs Ltd"}]
 license = {text = "MIT"}
 readme = "README.md"
@@ -20,5 +20,9 @@ classifiers = [
 py-modules = ["trace"]
 package-dir = {"" = "src"}
 
+[tool.setuptools.packages.find]
+where = ["src"]
+
 [project.scripts]
-codetracer-record = "trace:main"
+codetracer-record = "codetracer_pure_python_recorder.cli:main"
+codetracer-record-pure = "codetracer_pure_python_recorder.cli:main"