From: Bob Halley <halley@dnspython.org>
Date: Thu, 24 Nov 2022 15:27:12 +0000 (-0800)
Subject: DoQ packing and testing tweaks
X-Git-Tag: v2.3.0rc1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c411fdf63384a4cfb1446d10e91ed4ea2f5a90a;p=thirdparty%2Fdnspython.git

DoQ packing and testing tweaks
---

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 9dbf6c59..cc5a3688 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -22,8 +22,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         exclude:
+          - os: windows-latest
+            python-version: "3.10"
           - os: windows-latest
             python-version: "3.9"
           - os: windows-latest
@@ -41,8 +43,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install poetry
-        poetry install -E dnssec -E doh -E idna -E trio -E curio
-        poetry add aioquic
+        poetry install -E dnssec -E doh -E idna -E trio -E curio -E doq
     - name: Typecheck
       run: |
         poetry run python -m mypy --install-types --non-interactive --disallow-incomplete-defs dns
diff --git a/README.md b/README.md
index 1d368050..1906c154 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,9 @@ If you want to use WMI on Windows to determine the active DNS settings
 instead of the default registry scanning method, run
 `pip install dnspython[wmi]`.
 
+If you want to try the experimental DNS-over-QUIC code, run
+`pip install dnspython[doq]`.
+
 Note that you can install any combination of the above, e.g.:
 `pip install dnspython[doh,dnssec,idna]`
 
diff --git a/pyproject.toml b/pyproject.toml
index 5bc38270..13f78033 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,7 @@ trio = {version=">=0.14,<0.23", optional=true}
 curio = {version="^1.2", optional=true}
 sniffio = {version="^1.1", optional=true}
 wmi = {version="^1.5.1", optional=true}
-aioquic = {version="^0.9.20", optional=true}
+aioquic = {version=">=0.9.20", optional=true}
 
 [tool.poetry.dev-dependencies]
 pytest = ">=5.4.1,<8"
diff --git a/setup.cfg b/setup.cfg
index 2cb3e068..6fa2b877 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -55,6 +55,7 @@ DNSSEC = cryptography>=2.6
 trio = trio>=0.14.0
 curio = curio>=1.2; sniffio>=1.1
 wmi = wmi>=1.5.1
+DOQ = aioquic>=0.9.20
 
 [options.package_data]
 dns = py.typed