diff --git a/requirements.txt b/requirements.txt index d087648c..024ff0f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ docker escapism jupyterhub>=1.0 -pytest-jupyterhub @ git+https://github.com/jupyterhub/pytest-jupyterhub.git@main +pytest-jupyterhub diff --git a/tests/conftest.py b/tests/conftest.py index 78a5840c..f2b0d807 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,8 +8,6 @@ import jupyterhub import netifaces import pytest - -# from pytest_jupyterhub.jupyterhub_spawners import hub_app from docker import from_env as docker_from_env from docker.errors import APIError from jupyterhub import version_info as jh_version_info @@ -58,19 +56,6 @@ def pytest_collection_modifyitems(items): assert not inspect.isasyncgenfunction(item.obj) -""" -@pytest.fixture -def app(jupyterhub_app): - app = jupyterhub_app - app.config.DockerSpawner.prefix = "dockerspawner-test" - # If it's a prerelease e.g. (2, 0, 0, 'rc4', '') use full tag - if len(jh_version_info) > 3 and jh_version_info[3]: - tag = jupyterhub.__version__ - app.config.DockerSpawner.image = f"jupyterhub/singleuser:{tag}" - return app - """ - - @pytest.fixture async def app(hub_app): config = {"Dockerspawner": {"prefix": "dockerspawner-test"}}