From cae2875112ad8c2a4efc1fd54d1e9b6bb3c9ec70 Mon Sep 17 00:00:00 2001 From: Brian Kohan Date: Mon, 26 Aug 2024 14:17:36 -0700 Subject: [PATCH] add 3.13 to CI matrix, switch html theme to furo fix #26, fix #27 --- .github/workflows/test.yml | 8 +++++++- django_routines/__init__.py | 2 +- doc/.readthedocs.yaml | 5 ++--- doc/source/changelog.rst | 6 ++++++ doc/source/conf.py | 8 ++++++-- pyproject.toml | 36 +++++++++++++++++------------------- 6 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d99fc3..f9a542f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13.0-rc.1'] django-version: - '3.2' # LTS April 2024 - '4.2' # LTS April 2026 @@ -37,6 +37,12 @@ jobs: django-version: '3.2' - python-version: '3.12' django-version: '3.2' + - python-version: '3.13.0-rc.1' + django-version: '3.2' + - python-version: '3.13.0-rc.1' + django-version: '4.2' + - python-version: '3.13.0-rc.1' + django-version: '5.0' steps: - uses: actions/checkout@v4 diff --git a/django_routines/__init__.py b/django_routines/__init__.py index 62defc2..8a308d1 100644 --- a/django_routines/__init__.py +++ b/django_routines/__init__.py @@ -23,7 +23,7 @@ from django.core.exceptions import ImproperlyConfigured from django.utils.functional import Promise -VERSION = (1, 2, 0) +VERSION = (1, 2, 1) __title__ = "Django Routines" __version__ = ".".join(str(i) for i in VERSION) diff --git a/doc/.readthedocs.yaml b/doc/.readthedocs.yaml index fb27e9d..6cddfa5 100644 --- a/doc/.readthedocs.yaml +++ b/doc/.readthedocs.yaml @@ -12,10 +12,9 @@ build: python: "3.12" jobs: post_create_environment: - - pip install poetry==1.7.1 # 1.8 has a bug preventing this build from working - - poetry config virtualenvs.create false + - pip install poetry post_install: - - poetry install -E rich + - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry install -E rich # Build documentation in the docs/ directory with Sphinx sphinx: diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index e2189af..fc80a7b 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ========== +v1.2.1 (26-AUG-2024) +==================== + +* Fixed `Switch rtd theme to furo. `_ +* Fixed `Support python 3.13 `_ + v1.2.0 (27-JUL-2024) ==================== diff --git a/doc/source/conf.py b/doc/source/conf.py index 63e4257..a136ef0 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -46,7 +46,6 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - "sphinx_rtd_theme", "sphinx.ext.autodoc", "sphinx.ext.todo", "sphinxcontrib.typer" @@ -65,7 +64,12 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = "sphinx_rtd_theme" +html_theme = "furo" +html_theme_options = { + "source_repository": "https://github.com/bckohan/django-routines/", + "source_branch": "main", + "source_directory": "doc/source", +} # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, diff --git a/pyproject.toml b/pyproject.toml index f98a549..860bd98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-routines" -version = "1.2.0" +version = "1.2.1" description = "Define named groups of management commands in Django settings files for batched execution." authors = ["Brian Kohan "] license = "MIT" @@ -29,6 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Site Management", "Topic :: Software Development :: Libraries", @@ -54,24 +55,21 @@ typing-extensions = { version = ">=3.7.4.3", markers = "python_version < '3.10'" [tool.poetry.group.dev.dependencies] -ipdb = "^0.13.13" -pytest-django = "^4.7.0" -pytest-cov = "^5.0.0" -Sphinx = [ - { version = "^7.2.0", markers = "python_version > '3.8'" }, - { version = "^7.0.0", markers = "python_version <= '3.8'" }, -] -sphinx-rtd-theme = "^2.0.0" -doc8 = "^1.1.1" -aiohttp = "^3.9.1" -readme-renderer = {extras = ["md"], version = ">=42,<44"} -sphinxcontrib-typer = {extras = ["html", "pdf", "png"], version = "^0.3.0", markers="python_version >= '3.9'"} -pytest-env = "^1.0.0" -pexpect = "^4.9.0" -pyright = "^1.1.357" -ruff = ">=0.4.1,<0.6.0" -django-stubs = "^5.0.2" -mypy = "^1.10.0" +ipdb = ">=0.13.13" +pytest-django = ">=4.7.0" +pytest-cov = ">=5.0.0" +Sphinx = ">=7.0.0" +doc8 = ">=1.1.1" +aiohttp = ">=3.9.1" +readme-renderer = {extras = ["md"], version = ">=42"} +sphinxcontrib-typer = {extras = ["html", "pdf", "png"], version = ">=0.3.0", markers="python_version >= '3.9'"} +pytest-env = ">=1.0.0" +pexpect = ">=4.9.0" +pyright = ">=1.1.357" +ruff = ">=0.4.1" +django-stubs = ">=5.0.2" +mypy = ">=1.10.0" +furo = ">=2024.8.6" [tool.poetry.extras] rich = ["rich"]