From 5425d207c58e3c844f3fdc3d4d0b1b844bb89e3f Mon Sep 17 00:00:00 2001 From: Raphael Gaschignard Date: Thu, 26 Oct 2023 10:52:52 +0900 Subject: [PATCH 1/6] Add a readthedocs configuration file --- .readthedocs.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 00000000..393cba87 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,8 @@ +version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.9" + +sphinx: + configuration: docs/conf.py From a6271f4b3945a1fe2a7e625bb0bdc44a1b049f68 Mon Sep 17 00:00:00 2001 From: Raphael Gaschignard Date: Thu, 26 Oct 2023 10:57:02 +0900 Subject: [PATCH 2/6] Point to the right version in Sphinx --- docs/conf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 3d2aaeec..dad18370 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,3 +1,5 @@ +import taggit + extensions = ["sphinx.ext.intersphinx"] master_doc = "index" @@ -6,9 +8,9 @@ copyright = "Alex Gaynor and individual contributors." # The short X.Y version. -version = "1.3" +version = taggit.__version__ # The full version, including alpha/beta/rc tags. -release = "1.3.0" +release = taggit.__version__ intersphinx_mapping = { "django": ( From ed7b5b4566eca7d584ecfc4541a1c122b5e71d38 Mon Sep 17 00:00:00 2001 From: Raphael Gaschignard Date: Thu, 26 Oct 2023 11:00:23 +0900 Subject: [PATCH 3/6] install the project so that the version number is available --- .readthedocs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 393cba87..98944db1 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -4,5 +4,10 @@ build: tools: python: "3.9" +python: + install: + - method: pip + path: . + sphinx: configuration: docs/conf.py From f18f1660c38b6b91bf31d5556b7f5b6776a82a89 Mon Sep 17 00:00:00 2001 From: Raphael Gaschignard Date: Thu, 26 Oct 2023 11:06:31 +0900 Subject: [PATCH 4/6] Update the documentation for the Python and Django versions --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index b69227a5..611c28d3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,7 +4,7 @@ Welcome to django-taggit's documentation! ``django-taggit`` is a reusable Django application designed to make adding tagging to your project easy and fun. -``django-taggit`` works with Django 2.2+ and Python 3.6+. +``django-taggit`` works with Django 4.1+ and Python 3.8+. .. toctree:: :maxdepth: 2 From d04dcc36dd1b36f9aca9929f6d3076bb3112fe1a Mon Sep 17 00:00:00 2001 From: Raphael Gaschignard Date: Thu, 26 Oct 2023 11:07:35 +0900 Subject: [PATCH 5/6] Update the contributing doc to mention the docuemntation page as well --- CONTRIBUTING.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 3751c279..4d04876a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -90,6 +90,7 @@ These steps need to happen by a release maintainer. To make a release, the following needs to happen: - Make sure that ``setup.cfg`` is set up properly w/r/t Python and Django requirements +- Make sure the documentation (``docs/index.rst``) also describes the right Python/Django versions - Bump the version number in ``taggit/__init__.py`` - Update the changelog (making sure to add the (Unreleased) section to the top) - Get those changes onto the ``master`` branch From e2cffd8d59cc3ad564b9186f7bdb3ff4c8e23af4 Mon Sep 17 00:00:00 2001 From: Raphael Gaschignard Date: Thu, 26 Oct 2023 11:10:54 +0900 Subject: [PATCH 6/6] Properly bump the version number to 5.0.1 --- taggit/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taggit/__init__.py b/taggit/__init__.py index 964ed5b8..2682e192 100644 --- a/taggit/__init__.py +++ b/taggit/__init__.py @@ -1,2 +1,2 @@ -VERSION = (5, 0, 0) +VERSION = (5, 0, 1) __version__ = ".".join(str(i) for i in VERSION)