From e9b0e18556ed1c18f4de55ad70dc76464663c938 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Wed, 12 Jun 2024 10:22:09 -0400 Subject: [PATCH 1/4] Standardize Windows Python versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa7e67a9e2..a00f7f4109 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11', '3.12'] arch: ['x86', 'x64'] lsp: [''] lsp_extract_file: [''] From 05465d9543ebe5425dbaba6135bf32fb63bd099e Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Wed, 12 Jun 2024 10:32:10 -0400 Subject: [PATCH 2/4] Add new Windows socket constants --- src/trio/socket.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/trio/socket.py b/src/trio/socket.py index 6319716143..0257a7aada 100644 --- a/src/trio/socket.py +++ b/src/trio/socket.py @@ -121,6 +121,7 @@ AF_BRIDGE as AF_BRIDGE, AF_CAN as AF_CAN, AF_ECONET as AF_ECONET, + AF_HYPERV as AF_HYPERV, AF_INET as AF_INET, AF_INET6 as AF_INET6, AF_IPX as AF_IPX, @@ -249,6 +250,17 @@ HCI_DATA_DIR as HCI_DATA_DIR, HCI_FILTER as HCI_FILTER, HCI_TIME_STAMP as HCI_TIME_STAMP, + HVSOCKET_ADDRESS_FLAG_PASSTHRU as HVSOCKET_ADDRESS_FLAG_PASSTHRU, + HVSOCKET_CONNECTED_SUSPEND as HVSOCKET_CONNECTED_SUSPEND, + HVSOCKET_CONNECT_TIMEOUT as HVSOCKET_CONNECT_TIMEOUT, + HVSOCKET_CONNECT_TIMEOUT_MAX as HVSOCKET_CONNECT_TIMEOUT_MAX, + HV_GUID_BROADCAST as HV_GUID_BROADCAST, + HV_GUID_CHILDREN as HV_GUID_CHILDREN, + HV_GUID_LOOPBACK as HV_GUID_LOOPBACK, + HV_GUID_PARENT as HV_GUID_PARENT, + HV_GUID_WILDCARD as HV_GUID_WILDCARD, + HV_GUID_ZERO as HV_GUID_ZERO, + HV_PROTOCOL_RAW as HV_PROTOCOL_RAW, INADDR_ALLHOSTS_GROUP as INADDR_ALLHOSTS_GROUP, INADDR_ANY as INADDR_ANY, INADDR_BROADCAST as INADDR_BROADCAST, From af7726558504b241184a79eee7cd52f4d688f41e Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Wed, 12 Jun 2024 10:46:10 -0400 Subject: [PATCH 3/4] Add macos 3.11/3.12 --- .github/workflows/ci.yml | 2 +- src/trio/socket.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a00f7f4109..95ddcf0048 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,7 +143,7 @@ jobs: strategy: fail-fast: false matrix: - python: ['3.8', '3.9', '3.10'] + python: ['3.8', '3.9', '3.10', '3.11', '3.12'] continue-on-error: >- ${{ ( diff --git a/src/trio/socket.py b/src/trio/socket.py index 0257a7aada..e1ab95ea4d 100644 --- a/src/trio/socket.py +++ b/src/trio/socket.py @@ -511,6 +511,7 @@ SYSPROTO_CONTROL as SYSPROTO_CONTROL, TCP_CC_INFO as TCP_CC_INFO, TCP_CONGESTION as TCP_CONGESTION, + TCP_CONNECTION_INFO as TCP_CONNECTION_INFO, TCP_CORK as TCP_CORK, TCP_DEFER_ACCEPT as TCP_DEFER_ACCEPT, TCP_FASTOPEN as TCP_FASTOPEN, From ef16c01ba0b6b09dcaa4f8bacad6a9895dfe2829 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:54:57 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks --- src/trio/socket.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/trio/socket.py b/src/trio/socket.py index e1ab95ea4d..66f64bde09 100644 --- a/src/trio/socket.py +++ b/src/trio/socket.py @@ -250,10 +250,6 @@ HCI_DATA_DIR as HCI_DATA_DIR, HCI_FILTER as HCI_FILTER, HCI_TIME_STAMP as HCI_TIME_STAMP, - HVSOCKET_ADDRESS_FLAG_PASSTHRU as HVSOCKET_ADDRESS_FLAG_PASSTHRU, - HVSOCKET_CONNECTED_SUSPEND as HVSOCKET_CONNECTED_SUSPEND, - HVSOCKET_CONNECT_TIMEOUT as HVSOCKET_CONNECT_TIMEOUT, - HVSOCKET_CONNECT_TIMEOUT_MAX as HVSOCKET_CONNECT_TIMEOUT_MAX, HV_GUID_BROADCAST as HV_GUID_BROADCAST, HV_GUID_CHILDREN as HV_GUID_CHILDREN, HV_GUID_LOOPBACK as HV_GUID_LOOPBACK, @@ -261,6 +257,10 @@ HV_GUID_WILDCARD as HV_GUID_WILDCARD, HV_GUID_ZERO as HV_GUID_ZERO, HV_PROTOCOL_RAW as HV_PROTOCOL_RAW, + HVSOCKET_ADDRESS_FLAG_PASSTHRU as HVSOCKET_ADDRESS_FLAG_PASSTHRU, + HVSOCKET_CONNECT_TIMEOUT as HVSOCKET_CONNECT_TIMEOUT, + HVSOCKET_CONNECT_TIMEOUT_MAX as HVSOCKET_CONNECT_TIMEOUT_MAX, + HVSOCKET_CONNECTED_SUSPEND as HVSOCKET_CONNECTED_SUSPEND, INADDR_ALLHOSTS_GROUP as INADDR_ALLHOSTS_GROUP, INADDR_ANY as INADDR_ANY, INADDR_BROADCAST as INADDR_BROADCAST,