diff --git a/.gitignore b/.gitignore index b97131e..d01d2d5 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ dmypy.json .pyre/ .idea/ +.git_old diff --git a/pyproject.toml b/pyproject.toml index 94a4e63..e5ecc64 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires-python = ">=3.10" dependencies = [ "pytest>=6.0.0", "docker>=6.1.0", - "requests<2.32.0", + "requests<2.33.0", ] classifiers = [ "License :: OSI Approved :: MIT License", diff --git a/pytest_service/base.py b/pytest_service/base.py index 4bf3486..4b2e5bf 100644 --- a/pytest_service/base.py +++ b/pytest_service/base.py @@ -47,6 +47,7 @@ def run(self) -> Generator[T, None, None]: time.sleep(0.5) else: + assert container.id raw_logs = cast(bytes, self._client.api.logs(container.id)) pytest.fail( f"Failed to start {self.service_name} using {self._image} in {self._ready_timeout}" diff --git a/pytest_service/utils.py b/pytest_service/utils.py index 3eb1c96..c12d128 100644 --- a/pytest_service/utils.py +++ b/pytest_service/utils.py @@ -17,7 +17,7 @@ def __call__( def _try_get_is_postgres_ready_based_on_psycopg2() -> Optional[IsPostgresReadyFunc]: try: # noinspection PyPackageRequirements - import psycopg2 + import psycopg2 # type: ignore[reportMissingModuleSource] def _is_postgres_ready(**params: Any) -> bool: try: diff --git a/requirements-dev.txt b/requirements-dev.txt index 382130b..93f73d1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,12 +1,12 @@ -pytest==8.2.1 +pytest==8.2.2 isort==5.13.2 flake8==7.0.0 black==24.4.2 -setuptools==69.5.1 +setuptools==70.0.0 wheel==0.43.0 twine==5.1.0 -pyright==1.1.363 +pyright==1.1.367 -docker==7.0.0 +docker==7.1.0 -e .