From 6ef2f442ddbe75d73353e5a2eb6c11c0f5da6cae Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Wed, 29 Mar 2023 16:00:49 -0600
Subject: [PATCH 1/4] drop python 2, upgrade py3 versions

---
 .github/workflows/test.yml | 2 +-
 tox.ini                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d854f89..35e36a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index b3c39d8..8b19d9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = {py27,py35,py36,py37,pypy}
+envlist = {py37,py38,py39,py310,py311,pypy}
 skip_missing_interpreters = True
 minversion = 2.4.0
 

From f475a965608c3c19b527e98324809859bcee7f45 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Wed, 29 Mar 2023 16:04:48 -0600
Subject: [PATCH 2/4] notes

---
 NEWS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 7d5fdf4..105a29d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,8 @@ User-visible changes in "magic-wormhole-mailbox-server":
 ## Upcoming
 
 * correctly close a mailbox which still has a nameplate (#28)
+* remote python2 support
+* test on python 3.8, 3.9, 3.10 and 3.11 series
 
 
 ## Release 0.4.1 (11-Sep-2019)

From d34e3e6ecbd479d5eacfb028097ef1d6f45c22ae Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Wed, 29 Mar 2023 16:38:13 -0600
Subject: [PATCH 3/4] don't need six

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index ad9ff5a..d158456 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,6 @@
                 ],
       package_data={"wormhole_mailbox_server": ["db-schemas/*.sql"]},
       install_requires=[
-          "six",
           "attrs >= 16.3.0", # 16.3.0 adds __attrs_post_init__
           "twisted[tls] >= 17.5.0",
           "autobahn[twisted] >= 0.14.1",

From 8c3de8e846909b2a796ecfa49e2d44913115c3d3 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Wed, 29 Mar 2023 16:38:51 -0600
Subject: [PATCH 4/4] news

---
 NEWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.md b/NEWS.md
index 105a29d..8d9880c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,7 @@ User-visible changes in "magic-wormhole-mailbox-server":
 * correctly close a mailbox which still has a nameplate (#28)
 * remote python2 support
 * test on python 3.8, 3.9, 3.10 and 3.11 series
+* drop "six" (#35)
 
 
 ## Release 0.4.1 (11-Sep-2019)