From 928eb100dbb99970afa3cdc474355830bd870f5c Mon Sep 17 00:00:00 2001 From: Andrey Rakhmatullin Date: Mon, 5 Jan 2026 14:50:49 +0500 Subject: [PATCH] Updates to various changes --- Scrapy-release-procedure.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Scrapy-release-procedure.md b/Scrapy-release-procedure.md index 8ea08f5..eff7892 100644 --- a/Scrapy-release-procedure.md +++ b/Scrapy-release-procedure.md @@ -2,7 +2,7 @@ This page outlines the procedure used to release a new version of Scrapy. -You will need [bump2version](https://pypi.python.org/pypi/bump2version) installed. +You will need [bump-my-version](https://pypi.org/project/bump-my-version/) installed. ## Release notes @@ -37,7 +37,7 @@ If you are releasing major version `x.0.0`: git checkout master git pull --ff-only upstream master git log -1 # Check that the last commit is the release notes update -bump2version major +bump-my-version major git checkout -b x.0 git push upstream master x.0 x.0.0 ``` @@ -48,7 +48,7 @@ If you are releasing minor version `x.y.0`: git checkout master git pull --ff-only upstream master git log -1 # Check that the last commit is the release notes update -bump2version minor +bump-my-version minor git checkout -b x.y git push upstream master x.y x.y.0 ``` @@ -59,7 +59,7 @@ If you are releasing patch version `x.y.z`: git checkout x.y git pull --ff-only upstream x.y git log -1 # Check that the last commit is the release notes update -bump2version patch +bump-my-version patch git push upstream x.y x.y.z ``` @@ -68,15 +68,16 @@ git push upstream x.y x.y.z New Scrapy versions are automatically deployed on the [Python Package Index](https://pypi.org/project/Scrapy/) through [GitHub Actions](https://github.com/scrapy/scrapy/actions), at the -end of the tag build job where `PYPI_RELEASE_JOB=true` is defined. +end of the tag build job for tags matching `number.number.number`. +We are using Trusted Publishing. ## Read the Docs For new major and minor versions: -* Enable the new version: +* Enable the new version (TBD): - 1. Go to https://readthedocs.org/projects/scrapy/versions/ + 1. Go to https://app.readthedocs.org/projects/scrapy/versions/ 2. Find the entry of the new *branch* (not *tag*) under **Inactive Versions**, at the bottom of the page, and select **Edit**. @@ -84,7 +85,7 @@ For new major and minor versions: * Set the new version as default: - 1. Go to https://readthedocs.org/dashboard/scrapy/advanced/ + 1. Go to https://app.readthedocs.org/dashboard/scrapy/edit/ 3. Change the **Default branch** to the new *branch* (not *tag*), and select **Save** at the bottom of the page. @@ -99,7 +100,7 @@ re-packagings in the Python Package Index. ## scrapy.org website -Update [scrapy versions](https://github.com/scrapy/scrapy.github.io/blob/master/_data/scrapy.yml) +?? ## Send announcements