From 3136aac202342518bcd157fb57769dcf50f38f75 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 27 Nov 2022 10:14:31 -0600 Subject: [PATCH] Clean up release instructions and coverage handling (#1098) --- RELEASE.md | 10 ++++------ pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 82f143916a..29c4c54d25 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,7 +2,7 @@ ## Using `jupyter_releaser` -The recommended way to make a release is to use [`jupyter_releaser`](https://github.com/jupyter-server/jupyter_releaser#checklist-for-adoption). +The recommended way to make a release is to use [`jupyter_releaser`](https://jupyter-releaser.readthedocs.io/en/latest/get_started/making_release_from_repo.html). Note that we must use manual versions since Jupyter Releaser does not yet support "next" or "patch" when dev versions are used. @@ -14,11 +14,9 @@ To create a manual release, perform the following steps: ### Set up ```bash -pip install hatchling twine build +pip install hatch twine build git pull origin $(git branch --show-current) git clean -dffx -npm install -npm run build ``` ### Update the version and apply the tag @@ -26,7 +24,7 @@ npm run build ```bash echo "Enter new version" read new_version -hatchling version ${new_version} +hatch version ${new_version} git tag -a ${new_version} -m "Release ${new_version}" ``` @@ -42,7 +40,7 @@ python -m build . ```bash echo "Enter dev version" read dev_version -hatchling version ${dev_version} +hatch version ${dev_version} git push origin $(git branch --show-current) ``` diff --git a/pyproject.toml b/pyproject.toml index 713ec1346f..fae0df19df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -100,9 +100,9 @@ nowarn = "test -W default {args}" [tool.hatch.envs.cov] features = ["test"] -dependencies = ["coverage", "pytest-cov"] +dependencies = ["coverage[toml]"] [tool.hatch.envs.cov.scripts] -test = "python -m pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered {args}" +test = "coverage run -m pytest {args}" nowarn = "test -W default {args}" integration = "test --integration_tests=true {args}"