diff --git a/Makefile b/Makefile index efe4a40..fdd9a1c 100644 --- a/Makefile +++ b/Makefile @@ -90,19 +90,6 @@ changelog-entry: ## Create a new changelog entry changelog: ## Collect changelog entries in the CHANGELOG.md file scriv collect -release: test release-unsafe ## Create a release tag and push it to origin -release-unsafe: - $(MAKE) release-tag release-push TAG=v$(shell make version) -release-tag: - @echo "=== Creating tag $(TAG)" - git tag -d $(TAG) || true - git tag $(TAG) -release-push: - @echo "=== Pushing tag $(TAG) to origin" - git push origin - git push origin :$(TAG) || true - git push origin $(TAG) - release-description: ## Write the current release description to a file @sed "s/TUTOR_VERSION/v$(shell make version)/g" docs/_release_description.md @git log -1 --pretty=format:%b diff --git a/docs/tutor.rst b/docs/tutor.rst index ef9d872..4036ff8 100644 --- a/docs/tutor.rst +++ b/docs/tutor.rst @@ -71,7 +71,8 @@ Releasing a new version - Bump the ``__version__`` value in ``tutor/__about__.py``. (see :ref:`versioning` below) - Collect changelog entries with ``make changelog``. - Create a commit with the version changelog. -- Run ``make release``: this will create a tag and push to the default repo/branch for the current branch. +- Run tests with ``make test``. +- Push your changes to the upstream repository. .. _versioning: