Tox integration tests

.codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "wireup.integration"

.github/workflows/coverage.yml

@@ -1,33 +1,24 @@
 name: Test Coverage
-
-on: [push, pull_request]
-
+on: [push]
 jobs:
   test:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: 3.8
-
       - name: Create venv
         run: python -m venv .venv
-
       - name: Install dependencies
         run: make install
-
       - name: Run tests
-        run: .venv/bin/coverage run -m unittest discover -s test
-
+        run: .venv/bin/coverage run -m unittest discover -s test/unit
       - name: Generate coverage report
         run: |
           .venv/bin/coverage xml
-
       - name: Upload coverage to CodeClimate
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TOKEN }}

.github/workflows/run_all.yml

@@ -1,15 +1,11 @@
-name: Python package
-
+name: Run tests
 on: [push]
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/run_integration_tests.yml

@@ -0,0 +1,20 @@
+name: Integration tests
+on: [push]
+jobs:
+  test:
+    name: Run Tox
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.8"
+    - name: Create venv
+      run: python -m venv .venv
+    - name: Install dependencies
+      run: |
+        make install
+    - name: Run tox
+      run: .venv/bin/tox

Makefile

@@ -21,7 +21,7 @@ check-mypy:
 	.venv/bin/mypy wireup --strict
 
 test:
-	.venv/bin/python -m unittest discover -s test/
+	.venv/bin/python -m unittest discover -s test/unit
 
 profile ./profile_tests $(num_runs):
 	./.venv/bin/python ./profile_tests.py $(num_runs)

pyproject.toml

@@ -58,10 +58,8 @@ mkdocs-open-in-new-tab = "^1.0.2"
 mike = "^1.1.2"
 typing-extensions = "^4.7.1"
 mypy = "1.9.0"
-flask = "^3.0.0"
 coverage = "^7.3.2"
-fastapi = "^0.105.0"
-httpx = "^0.26.0"
+tox = "^4.14.2"
 
 [tool.ruff]
 target-version = "py38"
@@ -106,3 +104,6 @@ exclude_also = [
     "class .*\\bProtocol\\):",
     "@(abc\\.)?abstractmethod",
     ]
+
+[tool.mypy]
+exclude = "wireup.integration"

test/integration/test_fastapi_integration.py

@@ -4,7 +4,7 @@
 from fastapi.testclient import TestClient
 from typing_extensions import Annotated
 
-from test.services.no_annotations.random.random_service import RandomService
+from test.unit.services.no_annotations.random.random_service import RandomService
 from wireup import Wire, ParameterBag, DependencyContainer
 from wireup.errors import UnknownServiceRequestedError
 from wireup.integration.fastapi_integration import wireup_init_fastapi_integration

test/integration/test_flask_integration.py

@@ -2,10 +2,11 @@
 from dataclasses import dataclass
 
 from test.fixtures import FooBar, FooBase
-from test.services.no_annotations.random.random_service import RandomService
 
 from flask import Flask
 from typing_extensions import Annotated
+
+from test.unit.services.no_annotations.random.random_service import RandomService
 from wireup import DependencyContainer, ParameterBag, Wire
 from wireup.integration.flask_integration import wireup_init_flask_integration
 

test/unit/services/no_annotations/foo/__init__.py

@@ -0,0 +1 @@
+from test.unit.services.no_annotations.foo.baz_service import BazService

test/services/no_annotations/foo/baz_service.py → test/unit/services/no_annotations/foo/baz_service.py

@@ -1,5 +1,5 @@
-from test.services.no_annotations.db_service import DbService
-from test.services.no_annotations.foo.foo_service import FooService
+from test.unit.services.no_annotations.db_service import DbService
+from test.unit.services.no_annotations.foo.foo_service import FooService
 
 
 class BazService:

test/services/no_annotations/foo/foo_service.py → test/unit/services/no_annotations/foo/foo_service.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
-from test.services.no_annotations.db_service import DbService
+
+from test.unit.services.no_annotations.db_service import DbService
 
 
 @dataclass

test/services/no_annotations/random/truly_random_service.py → test/unit/services/no_annotations/random/truly_random_service.py

@@ -1,4 +1,4 @@
-from test.services.no_annotations.random.random_service import RandomService
+from test.unit.services.no_annotations.random.random_service import RandomService
 
 
 class TrulyRandomService:

test/test_container.py → test/unit/test_container.py

@@ -1,13 +1,14 @@
 import datetime
 import unittest
 from dataclasses import dataclass
-from test import services
 from test.fixtures import Counter, FooBar, FooBase, FooBaz
-from test.services.no_annotations.random.random_service import RandomService
-from test.services.no_annotations.random.truly_random_service import TrulyRandomService
 from unittest.mock import Mock, patch
 
 from typing_extensions import Annotated
+
+from test.unit import services
+from test.unit.services.no_annotations.random.random_service import RandomService
+from test.unit.services.no_annotations.random.truly_random_service import TrulyRandomService
 from wireup import ServiceLifetime, Wire, register_all_in_module, wire
 from wireup.errors import (
     DuplicateQualifierForInterfaceError,

test/test_container_optimized.py → test/unit/test_container_optimized.py

@@ -1,9 +1,10 @@
 import unittest
 from dataclasses import dataclass
 from test.fixtures import FooBar, FooBase, FooBaz
-from test.services.no_annotations.random.random_service import RandomService
 
 from typing_extensions import Annotated
+
+from test.unit.services.no_annotations.random.random_service import RandomService
 from wireup import DependencyContainer, ParameterBag, ServiceLifetime, Wire
 
 

test/test_container_override.py → test/unit/test_container_override.py

@@ -1,10 +1,11 @@
 import unittest
 
 from test.fixtures import FooBase, FooBar
-from test.services.no_annotations.random.random_service import RandomService
 from unittest.mock import MagicMock, patch
 
 from typing_extensions import Annotated
+
+from test.unit.services.no_annotations.random.random_service import RandomService
 from wireup import DependencyContainer, ParameterBag, Wire
 from wireup.ioc.override_manager import OverrideManager
 from wireup.ioc.types import ServiceOverride

test/test_container_proxy.py → test/unit/test_container_proxy.py

@@ -1,7 +1,7 @@
 import unittest
-from test.services.no_annotations.random.random_service import RandomService
-from test.services.no_annotations.random.truly_random_service import TrulyRandomService
 
+from test.unit.services.no_annotations.random.random_service import RandomService
+from test.unit.services.no_annotations.random.truly_random_service import TrulyRandomService
 from wireup.ioc.proxy import ContainerProxy
 
 

test/test_container_static_factory.py → test/unit/test_container_static_factory.py

@@ -1,7 +1,7 @@
 from test.fixtures import Counter, FooBar, FooBase
-from test.services.no_annotations.random.random_service import RandomService
 from unittest import TestCase
 
+from test.unit.services.no_annotations.random.random_service import RandomService
 from wireup import DependencyContainer, ParameterBag, ServiceLifetime, warmup_container, wire
 from wireup.errors import (
     DuplicateServiceRegistrationError,

test/test_initialization_context.py → test/unit/test_initialization_context.py

@@ -1,6 +1,6 @@
 import unittest
-from test.services.no_annotations.db_service import DbService
 
+from test.unit.services.no_annotations.db_service import DbService
 from wireup.ioc.initialization_context import InitializationContext
 from wireup.ioc.types import AnnotatedParameter
 

test/test_module_loading.py → test/unit/test_module_loading.py

@@ -1,9 +1,8 @@
 import unittest
-from test import services
-from test.services import no_annotations, with_annotations
-from test.services.with_annotations.env import EnvService
 
 import wireup
+from test.unit.services import no_annotations, with_annotations
+from test.unit.services.with_annotations.env import EnvService
 from wireup import DependencyContainer, ParameterBag, register_all_in_module, warmup_container
 
 

test/test_recursive_module_loading.py → test/unit/test_recursive_module_loading.py

@@ -1,7 +1,7 @@
 import re
 import unittest
 
-from test import services
+from test.unit import services
 from wireup import DependencyContainer, ParameterBag, register_all_in_module
 
 

test/test_service_registry.py → test/unit/test_service_registry.py

@@ -1,7 +1,8 @@
 import unittest
-from test.services.no_annotations.random.random_service import RandomService
 
 from typing_extensions import Annotated
+
+from test.unit.services.no_annotations.random.random_service import RandomService
 from wireup import ServiceLifetime, Wire
 from wireup.errors import (
     DuplicateServiceRegistrationError,

tox.ini

@@ -0,0 +1,26 @@
+[tox]
+requires =
+    tox>=4
+env_list =
+    py38-flask3
+    py38-fastapi
+
+[testenv:py38-flask3]
+description = Test flask integration
+allowlist_externals = make
+deps =
+    Flask>=3.0.0,<4.0.0
+commands =
+    make install
+    python -m unittest test/integration/test_flask_integration.py
+
+[testenv:py38-fastapi]
+description = Test fastapi integration
+allowlist_externals = make
+deps =
+    fastapi
+    httpx
+commands =
+    make install
+    python -m unittest test/integration/test_fastapi_integration.py
+