Merge branch 'main' into patch-2

.github/workflows/ci.yml

@@ -6,12 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["pypy-3.8", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version:
+          - "pypy-3.9"
+          - "pypy-3.10"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -26,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
           check-latest: true
@@ -43,9 +49,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
           check-latest: true

.github/workflows/release.yml

@@ -10,11 +10,11 @@ jobs:
       id-token: write
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.release.tag_name }}
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.x"
         check-latest: true

.gitpod.yml

@@ -26,4 +26,4 @@ vscode:
   extensions:
     - ms-python.python
     - EditorConfig.EditorConfig
-    - bungcip.better-toml
+    - tamasfe.even-better-toml

pyproject.toml

@@ -7,7 +7,11 @@ authors = [
 ]
 readme = "README.rst"
 license = {text = "Apache License, Version 2.0"}
-dependencies = ["nh3>=0.2.14", "docutils>=0.13.1", "Pygments>=2.5.1"]
+dependencies = [
+  "nh3>=0.2.14",
+  "docutils>=0.21.2",
+  "Pygments>=2.5.1",
+]
 classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: Apache Software License",
@@ -20,7 +24,6 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -29,7 +32,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
   "Typing :: Typed"
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [project.optional-dependencies]
 md = ["cmarkgfm>=0.8.0"]

readme_renderer/clean.py

@@ -26,7 +26,7 @@
     "br", "caption", "cite", "col", "colgroup", "dd", "del", "details", "div",
     "dl", "dt", "h1", "h2", "h3", "h4", "h5", "h6", "hr", "img", "p", "pre",
     "span", "sub", "summary", "sup", "table", "tbody", "td", "th", "thead",
-    "tr", "tt", "kbd", "var", "input", "section", "aside", "nav", "s", "figure",
+    "tr", "tt", "kbd", "var", "input", "section", "aside", "nav", "figure",
     "figcaption", "picture",
 }
 

tests/fixtures/test_rst_bibtex.html

@@ -1,2 +1,2 @@
 <pre><code><span class="nc">@article</span><span class="p">{</span><span class="nl">the_impact_of_pygments_docutils_config_and_html5</span><span class="p">,</span><span class="w">
-  </span><span class="na">year</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><s>{2022}</s><span class="p">,</span></code></pre>
+  </span><span class="na">year</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="s">{2022}</span><span class="p">,</span></code></pre>

tests/fixtures/test_rst_contents.html

@@ -1,5 +1,5 @@
 <nav class="contents" id="contents">
-<p class="topic-title">Contents</p>
+<p class="topic-title"><a href="#top" rel="nofollow">Contents</a></p>
 <ul class="simple">
 <li><p><a href="#features" id="toc-entry-1" rel="nofollow">Features</a></p></li>
 <li><p><a href="#installation" id="toc-entry-2" rel="nofollow">Installation</a></p></li>

tests/fixtures/test_rst_linkify.html

@@ -1,5 +1,9 @@
-<a href="https://travis-ci.org/tulsawebdevs/django-multi-gtfs" rel="nofollow"><img alt="https://travis-ci.org/tulsawebdevs/django-multi-gtfs.svg?branch=master" src="https://travis-ci.org/tulsawebdevs/django-multi-gtfs.svg?branch=master"></a>
-<a href="https://coveralls.io/github/tulsawebdevs/django-multi-gtfs" rel="nofollow"><img alt="https://coveralls.io/repos/github/tulsawebdevs/django-multi-gtfs/badge.svg?branch=django19" src="https://coveralls.io/repos/github/tulsawebdevs/django-multi-gtfs/badge.svg?branch=django19"></a>
+<a href="https://travis-ci.org/tulsawebdevs/django-multi-gtfs" rel="nofollow">
+<img alt="https://travis-ci.org/tulsawebdevs/django-multi-gtfs.svg?branch=master" src="https://travis-ci.org/tulsawebdevs/django-multi-gtfs.svg?branch=master">
+</a>
+<a href="https://coveralls.io/github/tulsawebdevs/django-multi-gtfs" rel="nofollow">
+<img alt="https://coveralls.io/repos/github/tulsawebdevs/django-multi-gtfs/badge.svg?branch=django19" src="https://coveralls.io/repos/github/tulsawebdevs/django-multi-gtfs/badge.svg?branch=django19">
+</a>
 <p><strong>multigtfs</strong> is an <a href="http://choosealicense.com/licenses/apache/" rel="nofollow">Apache 2.0</a>-licensed Django app that supports importing
 and exporting of GTFS feeds.  All features of the <a href="https://developers.google.com/transit/gtfs/reference" rel="nofollow">June 20, 2012 reference</a>
 are supported, including <a href="https://developers.google.com/transit/gtfs/changes#RevisionHistory" rel="nofollow">all changes</a> up to February 17, 2014.

tox.ini

@@ -1,8 +1,16 @@
 [tox]
-envlist = py38,py39,py310,py311,py312,pep8,packaging,noextra,mypy
+envlist =
+    py{39, 310, 311, 312}
+    pypy{39, 310}
+    pep8
+    packaging
+    noextra
+    mypy
 isolated_build = True
 
 [testenv]
+package = wheel
+wheel_build_env = build_wheel
 deps =
     pytest
     pytest-cov
@@ -22,10 +30,11 @@ commands = mypy readme_renderer
 
 [testenv:pep8]
 basepython = python3
+skip_install = true
 deps =
     flake8
     pep8-naming
-commands = flake8 .
+commands = flake8 readme_renderer tests
 
 [testenv:packaging]
 deps =
@@ -42,6 +51,5 @@ basepython = python3
 extras =
 
 [flake8]
-exclude = .tox,*.egg
 select = E,W,F,N
 max-line-length = 88