From bfd6bb9ad9417cb9cdc50880838ebd257e5fd5dc Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Thu, 25 Jan 2024 14:41:15 +0100 Subject: [PATCH] Add test to extras_require and remove dev-requirements.txt --- .github/workflows/test.yml | 2 +- CONTRIBUTING.md | 6 +----- dev-requirements.txt | 10 ---------- setup.py | 9 +++++++++ 4 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 dev-requirements.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5567b024..778a7775 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: - name: Install Python dependencies run: | pip install --upgrade setuptools pip - pip install -r dev-requirements.txt -e . + pip install -e ".[test]" - name: List Python dependencies run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bff225e3..c97aeb94 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,14 +10,10 @@ This package requires Python >= 3.6. As a Python package, you can set up a development environment by cloning this repo and running: - python3 -m pip install --editable . + python3 -m pip install --editable ".[test]" from the repo directory. -You can also install the tools we use for testing and development with: - - python3 -m pip install -r dev-requirements.txt - ### Auto-format with pre-commit We use the [pre-commit](https://pre-commit.com) tool for autoformatting. diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index a16f2c07..00000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -certipy -# add backend packages -jupyterhub-traefik-proxy[redis,etcd,consul] -notebook>=4.0 -pytest -# FIXME: unpin pytest-asyncio -pytest-asyncio>=0.17,<0.23 -pytest-cov -redis -websockets diff --git a/setup.py b/setup.py index 9bd23189..58da1d79 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,15 @@ # see https://github.com/jupyterhub/traefik-proxy/issues/155 for more "consul": ["python-consul2"], "etcd": ["etcdpy"], + "test": [ + "jupyterhub-traefik-proxy[redis,etcd,consul]", + "certipy", + "notebook>=4.0", + "pytest", + "pytest-asyncio>=0.17,<0.23", # FIXME: unpin pytest-asyncio + "pytest-cov", + "websockets", + ], }, python_requires=">=3.8", author="Project Jupyter Contributors",