Merge pull request #13 from Msameim181/fix/package_management

fix: resolve issues in license and package versions

Author: Msameim181

LICENSE

@@ -21,16 +21,24 @@ classifiers = [
     "Topic :: System :: Logging",
 ]
 dependencies = [
-    "asyncio==3.4.3",
-    "lagom==2.6.0",
-    "pydantic==2.9.2",
-    "fastapi==0.100.0",
-    "python-socketio==5.12.1",
-    "python-socketio[client]==5.12.1",
-    "uvicorn[standard]==0.30.6",
-    "uvicorn-worker==0.2.0",
-    "python-multipart==0.0.10",
-    "httpx==0.27.2",
+    "lagom>=2.6.0",
+    "pydantic>=2.9.2",
+    "fastapi>=0.100.0",
+    "python-socketio>=5.12.1",
+    "python-socketio[client]>=5.12.1",
+    "uvicorn[standard]>=0.30.6",
+    "uvicorn-worker>=0.2.0",
+    "python-multipart>=0.0.10",
+    "httpx>=0.27.2",
+]
+
+[project.optional-dependencies]
+django = ["django>=5.1.1"]
+dev = [
+    "pytest>=8.3.3",
+    "pytest-asyncio>=0.24.0",
+    "pytest-cov>=6.0.0",
+    "ruff>=0.1.0",
 ]
 
 [project.urls]
@@ -40,4 +48,28 @@ Repository = "https://github.com/Msameim181/Python-Logging-Best-Practice.git"
 Issues = "https://github.com/Msameim181/Python-Logging-Best-Practice/issues"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/chromatrace"]
+packages = ["src/chromatrace"]
+
+[tool.ruff]
+line-length = 100
+target-version = "py310"
+
+[tool.ruff.lint]
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "I",  # isort
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+]
+ignore = ["E501"]  # line length
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
+
+[tool.mypy]
+python_version = "3.10"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = true

pyproject.toml

@@ -1,4 +1,4 @@
 [pytest]
 asyncio_mode=auto
-asyncio_default_fixture_loop_scope="function"
+asyncio_default_fixture_loop_scope=function
 python_files = tests.py test_*.py *_tests.py *_test.py

pytest.ini

@@ -1,14 +1,19 @@
-asyncio==3.4.3
-django==5.1.1
-lagom==2.6.0
-pydantic==2.9.2
-fastapi==0.100.0
-python-socketio==5.12.1
-python-socketio[client]==5.12.1
-pytest==8.3.3
-pytest-asyncio==0.24.0
-pytest-cov==6.0.0
-uvicorn[standard]==0.30.6
-uvicorn-worker==0.2.0
-python-multipart==0.0.10
-httpx==0.27.2
+# Core dependencies
+lagom>=2.6.0
+pydantic>=2.9.2
+fastapi>=0.100.0
+python-socketio>=5.12.1
+python-socketio[client]>=5.12.1
+uvicorn[standard]>=0.30.6
+uvicorn-worker>=0.2.0
+python-multipart>=0.0.10
+httpx>=0.27.2
+
+# Optional: Django integration
+django>=5.1.1
+
+# Development dependencies
+pytest>=8.3.3
+pytest-asyncio>=0.24.0
+pytest-cov>=6.0.0
+ruff>=0.1.0

requirements.txt

@@ -1,24 +1,4 @@
 [metadata]
 license_files = LICENSE
-
-[tool.ruff]
-line-length = 100
-target-version = "py37"
-select = [
-    "E",  # pycodestyle errors
-    "W",  # pycodestyle warnings
-    "F",  # pyflakes
-    "I",  # isort
-    "C",  # flake8-comprehensions
-    "B",  # flake8-bugbear
-]
-ignore = ["E501"]  # line length
-
-[tool.ruff.per-file-ignores]
-"__init__.py" = ["F401"]
-
-[mypy]
-python_version = 3.10
-warn_return_any = True
-warn_unused_configs = True
-disallow_untyped_defs = True
+name = chromatrace
+description = Advanced logging for Python

setup.cfg

@@ -30,4 +30,4 @@ def callback(ch, method, properties, body):
             with rabbitmq_trace_context(ch, properties):
                 on_message_callback(ch, method, properties, body)
         self.channel.basic_consume(queue=queue, on_message_callback=callback, auto_ack=auto_ack)
-        self.channel.start_consuming()
+        self.channel.start_consuming()

src/chromatrace/RabbitMQ.py

@@ -10,4 +10,4 @@ async def dispatch(self, request: Request, call_next):
         with RequestIdContext(request_id):
             response = await call_next(request)
             response.headers["X-Request-ID"] = trace_id_ctx.get()
-            return response
+            return response

src/chromatrace/fastapi.py

@@ -132,7 +132,6 @@ def __init__(
         super().__init__(
             message_splitter=message_splitter,
             log_splitter=log_splitter,
-            *args,
             **kwargs,
         )
 

src/chromatrace/logging_settings.py

@@ -6,9 +6,10 @@
 from typing import Dict, List, Optional
 
 import socketio
+from pydantic import BaseModel, Field
+
 from chromatrace import LoggingConfig, LoggingSettings
 from chromatrace.tracer import trace_id_ctx
-from pydantic import BaseModel, Field
 
 logging_config = LoggingConfig(
     LoggingSettings(

src/examples/adaptors/socket_client.py

@@ -1,13 +1,14 @@
 import multiprocessing
 
 import uvicorn
-from chromatrace import LoggingConfig
-from chromatrace.fastapi import RequestIdMiddleware
-from chromatrace.uvicorn import GetLoggingConfig, UvicornLoggingSettings
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from usecases import AnotherSample, ExampleService
 
+from chromatrace import LoggingConfig
+from chromatrace.fastapi import RequestIdMiddleware
+from chromatrace.uvicorn import GetLoggingConfig, UvicornLoggingSettings
+
 
 class APIService:
     def __init__(