Merge branch 'main' into 2.0.1-changelog

Author: sigmavirus24

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "github_actions"
+      - "Skip Changelog"
+    ignore:
+      # Ignore all patch releases as we can manually
+      # upgrade if we run into a bug and need a fix.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-patch"]

.github/workflows/main.yml

@@ -12,24 +12,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python: [pypy3.7, 3.7, 3.9, "3.10", 3.11, 3.12-dev]
+        python: ['pypy3.9', '3.8', '3.9', '3.10', '3.11', '3.12']
         toxenv: [py]
         include:
         # windows
         - os: windows-latest
-          python: 3.7
+          python: '3.12'
           toxenv: py
         # misc
         - os: ubuntu-latest
-          python: 3.9
+          python: '3.12'
           toxenv: docs
         - os: ubuntu-latest
-          python: 3.9
+          python: '3.12'
           toxenv: pre-commit
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+    - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
       with:
         python-version: ${{ matrix.python }}
     - run: python -mpip install --upgrade setuptools pip tox virtualenv

.pre-commit-config.yaml

@@ -1,36 +1,36 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
   hooks:
   - id: check-yaml
   - id: debug-statements
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/asottile/reorder-python-imports
-  rev: v3.9.0
+  rev: v3.12.0
   hooks:
   - id: reorder-python-imports
     args: [--application-directories, '.:src', --py37-plus]
 - repo: https://github.com/psf/black
-  rev: 23.3.0
+  rev: 23.12.1
   hooks:
   - id: black
     args: [--line-length=79]
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.4.0
+  rev: v3.15.0
   hooks:
   - id: pyupgrade
     args: [--py37-plus]
 - repo: https://github.com/pycqa/flake8
-  rev: 6.0.0
+  rev: 6.1.0
   hooks:
   - id: flake8
     exclude: ^(tests/|docs/|setup.py)
     additional_dependencies:
     - flake8-docstrings
     - flake8-import-order
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v2.2.0
+  rev: v2.5.0
   hooks:
   - id: setup-cfg-fmt
     args: [--include-version-classifiers]

.readthedocs.yaml

@@ -0,0 +1,27 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/source/conf.py
+  builder: "dirhtml"
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: []
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - path: .
+    - requirements: docs/source/requirements.txt

docs/source/conf.py

@@ -167,4 +167,4 @@
 
 
 # Configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}
+intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}

setup.cfg

@@ -8,7 +8,7 @@ url = http://rfc3986.readthedocs.io
 author = Ian Stapleton Cordasco
 author_email = [email protected]
 license = Apache 2.0
-license_file = LICENSE
+license_files = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     Intended Audience :: Developers
@@ -17,18 +17,18 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Programming Language :: Python :: Implementation :: CPython
 project_urls =
     Source = https://github.com/python-hyper/rfc3986
 
 [options]
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.8
 include_package_data = True
 package_dir = =src