Merge pull request #83 from ColtonPayne/main

Final Testing Changes

Author: dyumanaditya

.github/workflows/python-package-version-test.yml

@@ -35,13 +35,13 @@ jobs:
         python -m ruff check pyreason/scripts
     - name: Pytest Unit Tests with JIT Disabled
       run: |
-        pytest tests/unit/disable_jit -m "not slow" --tb=short -q
+        pytest tests/unit/disable_jit --tb=short -q
     - name: Pytest Unit Tests with JIT Enabled
       run: |
-        pytest tests/unit/dont_disable_jit -m "not slow" --tb=short -q
+        pytest tests/unit/dont_disable_jit --tb=short -q
     - name: Pytest API Tests
       run: |
-        pytest tests/unit/api_tests --tb=short -q
+        pytest tests/api_tests --tb=short -q
     - name: Pytest Functional Tests
       run: |
-        pytest tests/functional/ --tb=short
+        pytest tests/functional/ --tb=short -q

.pre-commit-config.yaml

@@ -18,6 +18,14 @@ repos:
         pass_filenames: false
         stages: [pre-commit]
 
+      - id: sync-interpretation-parallel
+        name: Sync interpretation_parallel.py from interpretation.py
+        entry: .venv/bin/python sync_interpretation_parallel.py
+        language: system
+        pass_filenames: false
+        files: 'pyreason/scripts/interpretation/interpretation\.py'
+        stages: [pre-commit]
+
       - id: pytest-unit-no-jit
         name: Run JIT-disabled unit tests
         entry: .venv/bin/python -m pytest tests/unit/disable_jit -m "not slow" --tb=short -q
@@ -34,15 +42,15 @@ repos:
 
       # --- PUSH STAGE: Complete test suite ---
       - id: pytest-unit-api
-        name: Run pyreason api unit tests
-        entry: .venv/bin/python -m pytest tests/unit/api_tests --tb=short -q
+        name: Run pyreason api tests
+        entry: .venv/bin/python -m pytest tests/api_tests --tb=short -q
         language: system
         pass_filenames: false
         stages: [pre-push]
 
       - id: pytest-functional-complete
         name: Run functional test suite
-        entry: .venv/bin/python -m pytest tests/functional/ --tb=short
+        entry: .venv/bin/python -m pytest tests/functional/ --tb=short -q
         language: system
         pass_filenames: false
         stages: [pre-push]

Makefile

@@ -2,7 +2,7 @@
 # Provides convenient shortcuts for running different test configurations
 
 .PHONY: help test test-all test-fast test-api test-jit test-no-jit test-consistency \
-        test-parallel test-no-coverage coverage-report coverage-html coverage-xml \
+        test-parallel test-sequential test-no-coverage coverage-report coverage-html coverage-xml \
         clean clean-coverage clean-reports install-deps lint check-deps
 
 # Default target
@@ -37,16 +37,16 @@ help: ## Show this help message
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "  $(GREEN)%-20s$(RESET) %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 	@echo ""
 	@echo "$(BLUE)Examples:$(RESET)"
-	@echo "  make test                 # Run all test suites with coverage and open report"
+	@echo "  make test                 # Run all test suites in parallel with coverage"
+	@echo "  make test-sequential      # Run all test suites sequentially (slower)"
 	@echo "  make test-fast            # Run only fast test suites"
 	@echo "  make test-api             # Run only API tests"
-	@echo "  make test-parallel        # Run tests in parallel where possible"
 	@echo "  make coverage-html        # Generate HTML coverage report"
 
 # Main test targets
-test: ## Run all test suites with coverage and open report
-	@echo "$(BOLD)$(BLUE)Running all test suites...$(RESET)"
-	$(RUN_TESTS)
+test: ## Run all test suites with coverage and open report (in parallel)
+	@echo "$(BOLD)$(BLUE)Running all test suites in parallel...$(RESET)"
+	$(RUN_TESTS) --parallel
 	@echo "$(BOLD)$(GREEN)Opening coverage report in browser...$(RESET)"
 	@if [ -f test_reports/htmlcov/index.html ]; then \
 		open test_reports/htmlcov/index.html 2>/dev/null || \
@@ -58,8 +58,12 @@ test: ## Run all test suites with coverage and open report
 
 test-all: test ## Alias for 'test' target
 
-test-only: ## Run all test suites with coverage (no browser)
-	@echo "$(BOLD)$(BLUE)Running all test suites...$(RESET)"
+test-only: ## Run all test suites with coverage (no browser, in parallel)
+	@echo "$(BOLD)$(BLUE)Running all test suites in parallel...$(RESET)"
+	$(RUN_TESTS) --parallel
+
+test-sequential: ## Run all test suites sequentially (no parallelization)
+	@echo "$(BOLD)$(BLUE)Running all test suites sequentially...$(RESET)"
 	$(RUN_TESTS)
 
 test-fast: ## Run only fast test suites (api_tests, dont_disable_jit)
@@ -75,7 +79,7 @@ test-no-coverage: ## Run all tests without coverage collection
 	$(RUN_TESTS) --no-coverage
 
 # Individual test suite targets
-test-api: ## Run only API tests (tests/unit/api_tests)
+test-api: ## Run only API tests (tests/api_tests)
 	@echo "$(BOLD)$(BLUE)Running API tests...$(RESET)"
 	$(RUN_TESTS) --suite api_tests
 
@@ -96,9 +100,9 @@ test-functional: ## Run functional/end-to-end tests
 	$(RUN_TESTS) --suite functional
 
 
-test-all-suites: ## Run all test suites including functional tests
-	@echo "$(BOLD)$(BLUE)Running all test suites including functional...$(RESET)"
-	$(RUN_TESTS)
+test-all-suites: ## Run all test suites including functional tests (in parallel)
+	@echo "$(BOLD)$(BLUE)Running all test suites including functional in parallel...$(RESET)"
+	$(RUN_TESTS) --parallel
 
 # Coverage targets
 coverage-report: ## Show coverage report in terminal

contributing.md

@@ -5,7 +5,6 @@ Install the project requirements and the pre-commit framework:
 
 ```bash
 pip install -r requirements.txt
-pip install pre-commit
 ```
 
 ## Setting up Pre-Commit Hooks
@@ -36,7 +35,7 @@ this command to view linting results:
 
 PyReason uses a unified test runner that handles multiple test configurations automatically. The test suite is organized into four directories:
 
-- **`tests/unit/api_tests/`** - Tests for main pyreason.py API functions (JIT enabled, real pyreason)
+- **`tests/api_tests/`** - Tests for main pyreason.py API functions (JIT enabled, real pyreason)
 - **`tests/unit/disable_jit/`** - Tests for internal interpretation logic (JIT disabled, stubbed environment)
 - **`tests/unit/dont_disable_jit/`** - Tests for components that benefit from JIT (JIT enabled, lightweight stubs)
 - **`tests/functional/`** - End-to-end functional tests (JIT enabled, real pyreason, longer running)
@@ -57,33 +56,12 @@ make test-fast
 make coverage-html
 ```
 
-### Individual Test Suites
-
-```bash
-# API tests (real pyreason, JIT enabled)
-make test-api
-
-# JIT disabled tests (stubbed environment)
-make test-jit
-
-# JIT enabled tests (lightweight stubs)
-make test-no-jit
-
-# Consistency tests
-make test-consistency
-
-# Functional/end-to-end tests
-make test-functional
-```
-
 ### Advanced Options
 
 ```bash
-# Run with parallel execution where possible
-make test-parallel
+# Run with sequential execution 
+make make test-sequential
 
-# Run without coverage collection (faster)
-python run_tests.py --no-coverage
 
 # Run specific suites
 python run_tests.py --suite api_tests --suite dont_disable_jit
@@ -99,10 +77,7 @@ You can still run pytest directly on individual directories:
 
 ```bash
 # API tests
-pytest tests/unit/api_tests/ -v
-
-# JIT disabled tests
-NUMBA_DISABLE_JIT=1 pytest tests/unit/disable_jit/ -v
+pytest tests/api_tests/ -v
 
 # JIT enabled tests
 pytest tests/unit/dont_disable_jit/ -v
@@ -138,10 +113,3 @@ pytest tests/functional/test_hello_world.py -v
 # Clean up generated files
 make clean
 ```
-
-**Common Issues:**
-- **Functional tests fail with warnings**: The pytest.ini has been updated to ignore expected warnings from numba and networkx
-- **Tests time out**: Functional tests have longer timeouts (600s) and global timeout is disabled
-- **Import errors**: Ensure pytest and dependencies are installed with `make install-deps`
-
-Running tests locally before committing or pushing helps catch issues early and speeds up code review. The unified test runner ensures consistent behavior across different development environments.