diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index ea0b4e5..4c22a52 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-22.04', 'windows-2019']
+        os: ['ubuntu-22.04', 'windows-2022']
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/octocheese.yml b/.github/workflows/octocheese.yml
index fd77cd0..a5b3f19 100644
--- a/.github/workflows/octocheese.yml
+++ b/.github/workflows/octocheese.yml
@@ -6,6 +6,9 @@ on:
   schedule:
     - cron: 0 12 * * *
 
+permissions:
+  contents: write
+
 jobs:
   Run:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
index f6491d9..03f5a31 100644
--- a/.github/workflows/python_ci.yml
+++ b/.github/workflows/python_ci.yml
@@ -18,8 +18,8 @@ permissions:
 
 jobs:
   tests:
-    name: "windows-2019 / Python ${{ matrix.config.python-version }}"
-    runs-on: "windows-2019"
+    name: "windows-2022 / Python ${{ matrix.config.python-version }}"
+    runs-on: "windows-2022"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
       USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9,pypy-3.10'
@@ -36,8 +36,8 @@ jobs:
           - {python-version: "3.12", testenvs: "py312,build", experimental: False}
           - {python-version: "3.13", testenvs: "py313,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
-          - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
-          - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39,build", experimental: True}
+          - {python-version: "pypy-3.8", testenvs: "pypy38", experimental: False}
+          - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39", experimental: True}
           - {python-version: "pypy-3.10-v7.3.15", testenvs: "pypy310,build", experimental: True}
 
     steps:
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
index fb7d97a..05f968a 100644
--- a/.github/workflows/python_ci_linux.yml
+++ b/.github/workflows/python_ci_linux.yml
@@ -162,7 +162,7 @@ jobs:
 
       - name: Upload distribution to PyPI 🚀
         if: startsWith(github.ref, 'refs/tags/')
-        uses: pypa/gh-action-pypi-publish@v1.4.2
+        uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7cd6d6..00f956a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,7 +62,7 @@ repos:
     - id: rst-inline-touching-normal
 
  - repo: https://github.com/asottile/pyupgrade
-   rev: v2.12.0
+   rev: v3.3.0
    hooks:
     - id: pyupgrade
       args:
diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt
index 254a696..faad183 100644
--- a/doc-source/requirements.txt
+++ b/doc-source/requirements.txt
@@ -1,4 +1,5 @@
 default-values>=0.6.0
+docutils<0.22
 domdf-sphinx-theme>=0.3.0
 extras-require>=0.5.0
 html-section>=0.3.0
@@ -6,6 +7,7 @@ pandas>=1.1.2
 pytest>=6.2.0
 pytest-regressions>=2.0.2
 pytz>=2019.1
+roman>=4.0
 seed-intersphinx-mapping>=1.2.2
 sphinx>=3.0.3
 sphinx-autofixture>=0.2.1
diff --git a/pyproject.toml b/pyproject.toml
index c59701f..163c55c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ name = "domdf_python_tools"
 version = "3.10.0"
 description = "Helpful functions for Python 🐍 🛠️"
 readme = "README.rst"
-requires-python = ">=3.6"
+requires-python = ">=3.7"
 keywords = [ "utilities",]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
diff --git a/tox.ini b/tox.ini
index 147ddf7..24cfcdc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,7 +69,6 @@ download = True
 setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
-    UNSAFE_PYO3_SKIP_VERSION_CHECK=1
 
 [testenv:py312]
 download = True
@@ -125,11 +124,12 @@ deps =
     flake8-sphinx-links>=0.0.4
     flake8-strftime>=0.1.1
     flake8-typing-imports>=1.10.0
+    git+https://github.com/domdfcoding/restructuredtext-lint.git@fix-deprecations
     git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git
     git+https://github.com/domdfcoding/flake8-rst-docstrings.git
     git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods
     git+https://github.com/python-formate/flake8-missing-annotations.git
-    pydocstyle>=6.0.0
+    git+https://github.com/domdfcoding/pydocstyle.git@stub-functions
     pygments>=2.7.1
     importlib_metadata<4.5.0; python_version<'3.8'
 commands = python3 -m flake8_rst_docstrings_sphinx domdf_python_tools tests --allow-toolbox {posargs}
@@ -212,7 +212,7 @@ inline-quotes = "
 multiline-quotes = """
 docstring-quotes = """
 count = True
-min_python_version = 3.6
+min_python_version = 3.7
 unused-arguments-ignore-abstract-functions = True
 unused-arguments-ignore-overload-functions = True
 unused-arguments-ignore-magic-methods = True