Claude...

Author: venantvr

.coveragerc

@@ -1,72 +1,44 @@
-.PHONY: help install install-dev test test-cov lint format clean run-server run-client build docker-build docker-run pre-commit docs docs-serve
+.PHONY: help test clean format check install
 
-help: ## Show this help message
-	@echo "Usage: make [target]"
-	@echo ""
-	@echo "Available targets:"
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
-
-install: ## Install production dependencies
-	pip install -r requirements.txt
-
-install-dev: ## Install development dependencies
-	pip install -r requirements-dev.txt
-	pip install -e .
-	pre-commit install
-
-test: ## Run tests
-	pytest tests/ -v
-
-test-cov: ## Run tests with coverage
-	pytest tests/ --cov=src --cov-report=term-missing --cov-report=html:coverage/htmlcov --cov-report=xml:coverage/coverage.xml
+PYTHON := $(if $(wildcard .venv/bin/python),.venv/bin/python,python3)
+PIP := $(if $(wildcard .venv/bin/pip),.venv/bin/pip,pip3)
+SOURCES := tests
 
-test-watch: ## Run tests in watch mode
-	pytest-watch tests/ -v
-
-lint: ## Run linting checks
-	@echo "Running flake8..."
-	flake8 src/ tests/
-	@echo "Running mypy..."
-	mypy src/
-	@echo "Running ruff..."
-	ruff check src/ tests/
-
-format: ## Format code with black and isort
-	black src/ tests/
-	isort src/ tests/
-	ruff check --fix src/ tests/
-
-clean: ## Clean up generated files
+# Default target
+help:
+	@echo "Available targets:"
+	@echo "  test      Run tests"
+	@echo "  format    Format code with black and isort"
+	@echo "  check     Run format and tests"
+	@echo "  clean     Clean up generated files"
+	@echo "  install   Install dependencies"
+	@echo "  update    Update dependencies"
+
+# Testing
+test:
+	$(PYTHON) -m pytest tests/ -v --tb=short
+
+# Code formatting
+format:
+	$(PYTHON) -m black $(SOURCES) tests/
+	$(PYTHON) -m isort $(SOURCES) tests/
+
+# Combined check
+check: format test
+
+# Installation
+install:
+	$(PIP) install -r requirements.txt
+	$(PIP) install -r requirements-dev.txt
+
+# Updates
+update:
+	$(PIP) install --upgrade pip
+	$(PIP) install --upgrade -r requirements.txt
+	$(PIP) install --upgrade -r requirements-dev.txt
+
+# Clean up
+clean:
+	rm -rf build/ dist/ *.egg-info .pytest_cache/ .mypy_cache/
+	find . -type d -name __pycache__ -exec rm -rf {} + 2>/dev/null || true
 	find . -type f -name "*.pyc" -delete
-	find . -type d -name "__pycache__" -delete
-	find . -type d -name ".pytest_cache" -exec rm -rf {} +
-	find . -type d -name ".mypy_cache" -exec rm -rf {} +
-	find . -type d -name ".ruff_cache" -exec rm -rf {} +
-	rm -rf coverage/
-	rm -rf htmlcov/
-	rm -f coverage.xml coverage.json .coverage
-	rm -rf dist/ build/ *.egg-info src/*.egg-info
-
-run-server: ## Run the WebSocket server
-	python src/pubsub_ws.py
-
-run-client: ## Run the client
-	python src/client.py
-
-build: ## Build the package
-	python -m build
-
-docker-build: ## Build Docker image
-	docker build -t python.publisher.subscriber:latest .
-
-docker-run: ## Run Docker container
-	docker run -p 5000:5000 python.publisher.subscriber:latest
-
-pre-commit: ## Run pre-commit hooks
-	pre-commit run --all-files
-
-docs: ## Generate documentation
-	cd docs && make html
-
-docs-serve: ## Serve documentation locally
-	cd docs && python -m http.server --directory _build/html 8000

Makefile

@@ -40,7 +40,6 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "pytest==7.4.3",
-    "pytest-cov==4.1.0",
     "pytest-mock==3.12.0",
     "pytest-asyncio==0.21.1",
     "pytest-watch==4.2.0",
@@ -118,44 +117,12 @@ minversion = "7.0"
 addopts = [
     "-ra",
     "--strict-markers",
-    "--cov=src",
-    "--cov-report=term-missing",
-    "--cov-report=html:coverage/htmlcov",
-    "--cov-report=xml:coverage/coverage.xml",
-    "--cov-report=json:coverage/coverage.json",
 ]
 testpaths = ["tests"]
 python_files = ["test_*.py", "*_test.py"]
 python_classes = ["Test*"]
 python_functions = ["test_*"]
 
-[tool.coverage.run]
-source = ["src"]
-omit = [
-    "*/tests/*",
-    "*/test_*.py",
-    "*/__pycache__/*",
-    "*/migrations/*",
-    "*/.venv/*",
-]
-
-[tool.coverage.report]
-exclude_lines = [
-    "pragma: no cover",
-    "def __repr__",
-    "if self.debug:",
-    "if __name__ == .__main__.:",
-    "raise AssertionError",
-    "raise NotImplementedError",
-    "if 0:",
-    "if False:",
-    "pass",
-]
-precision = 2
-show_missing = true
-
-[tool.coverage.html]
-directory = "coverage/htmlcov"
 
 [tool.ruff]
 line-length = 100

pyproject.toml

@@ -3,7 +3,6 @@
 
 # Development and testing dependencies
 pytest==7.4.3
-pytest-cov==4.1.0
 pytest-mock==3.12.0
 pytest-asyncio==0.21.1
 pytest-watch==4.2.0

requirements-dev.txt

@@ -42,7 +42,6 @@ where = src
 [options.extras_require]
 dev =
     pytest==7.4.3
-    pytest-cov==4.1.0
     pytest-mock==3.12.0
     pytest-asyncio==0.21.1
     pytest-watch==4.2.0
@@ -100,35 +99,7 @@ python_functions = test_*
 addopts =
     -ra
     --strict-markers
-    --cov=src
-    --cov-report=term-missing
-    --cov-report=html:coverage/htmlcov
-    --cov-report=xml:coverage/coverage.xml
-    --cov-report=json:coverage/coverage.json
 
-[coverage:run]
-source = src
-omit =
-    */tests/*
-    */test_*.py
-    */__pycache__/*
-    */migrations/*
-    */.venv/*
-
-[coverage:report]
-exclude_lines =
-    pragma: no cover
-    def __repr__
-    if self.debug:
-    if __name__ == .__main__.:
-    raise AssertionError
-    raise NotImplementedError
-    if 0:
-    if False:
-    pass
-
-[coverage:html]
-directory = coverage/htmlcov
 
 [isort]
 profile = black

setup.cfg

@@ -45,7 +45,7 @@ def init_db(db_name: str, connection: Optional[sqlite3.Connection] = None) -> No
 
 # Default DB file name
 DB_FILE_NAME = "pubsub.db"
-# --- FIN MODIFICATION POUR LA GESTION DE LA DB ET LES TESTS ---
+# --- END MODIFICATION FOR DB MANAGEMENT AND TESTS ---
 
 
 app = Flask(__name__)
@@ -97,7 +97,7 @@ def register_subscription(self, sid: str, consumer: str, topic: str) -> None:
 
             socketio.emit(
                 "new_client",
-                {"consumer": consumer, "topic": topic, "connected_at": time.time()},  # Ajoutez le timestamp pour l'UI
+                {"consumer": consumer, "topic": topic, "connected_at": time.time()},  # Add timestamp for the UI
             )
         except sqlite3.Error as e:
             logger.error(f"Database error during subscription registration: {e}")

src/pubsub_ws.py

@@ -97,7 +97,6 @@ def test_requirements_file():
     content = req_file.read_text()
     assert "Flask" in content
     assert "flask-socketio" in content
-    assert "pytest" in content
 
 
 @pytest.mark.parametrize(

tests/test_basic.py

@@ -17,7 +17,12 @@ class TestIntegration:
 
     def test_json_message_structure(self):
         """Test JSON message structure for pub/sub."""
-        message = {"topic": "test", "message_id": "123", "message": "Hello World", "producer": "test_producer"}
+        message = {
+            "topic": "test",
+            "message_id": "123",
+            "message": "Hello World",
+            "producer": "test_producer",
+        }
 
         # Test serialization
         json_str = json.dumps(message)
@@ -56,10 +61,13 @@ def test_database_integration(self):
 
         # Test message flow
         cursor.execute(
-            "INSERT INTO messages (topic, message, producer) VALUES (?, ?, ?)", ("sports", "Game started", "sports_bot")
+            "INSERT INTO messages (topic, message, producer) VALUES (?, ?, ?)",
+            ("sports", "Game started", "sports_bot"),
         )
 
-        cursor.execute("INSERT INTO subscriptions (consumer, topic) VALUES (?, ?)", ("alice", "sports"))
+        cursor.execute(
+            "INSERT INTO subscriptions (consumer, topic) VALUES (?, ?)", ("alice", "sports")
+        )
 
         # Verify integration
         cursor.execute(
@@ -117,7 +125,8 @@ def insert_messages(thread_id):
                     # noinspection PyShadowingNames
                     for i in range(3):
                         thread_cursor.execute(
-                            "INSERT INTO test_messages (content, thread_id) VALUES (?, ?)", (f"Message {i}", thread_id)
+                            "INSERT INTO test_messages (content, thread_id) VALUES (?, ?)",
+                            (f"Message {i}", thread_id),
                         )
                     thread_conn.commit()
                     thread_conn.close()
@@ -235,7 +244,11 @@ def test_websocket_message_format(self):
     def test_subscription_matching(self):
         """Test subscription topic matching logic."""
         # Simulate subscription patterns
-        subscriptions = {"alice": ["sports", "news"], "bob": ["tech", "finance"], "charlie": ["sports", "tech", "news"]}
+        subscriptions = {
+            "alice": ["sports", "news"],
+            "bob": ["tech", "finance"],
+            "charlie": ["sports", "tech", "news"],
+        }
 
         # Test message routing
         message_topic = "sports"