From 5a9400a52de068eefaf8dba6e1c96b1f7ca36abb Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Wed, 21 Jun 2023 13:12:35 +0100
Subject: [PATCH] Officially support Python 3.10 and 3.11

Also:
- Run some tests on 3.11 as well
- Don't pass deprecated arguments to `setup()` .
- Fix flake8 errors on Python 3.10
---
 .github/workflows/ci.yaml |  7 +++++++
 planemo/shed2tap/base.py  |  2 +-
 setup.py                  | 11 ++---------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 33fce0c91..5a9c3eefb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -35,6 +35,13 @@ jobs:
           - unit-nonredundant-noclientbuild-noshed-gx-dev
           - unit-nonredundant-noclientbuild-noshed-nogx
           - unit-diagnostic-serveclientcmd
+        include:
+          - python-version: '3.11'
+            tox-action: lint
+          - python-version: '3.11'
+            tox-action: mypy
+          - python-version: '3.11'
+            tox-action: unit-quick
     services:
       postgres:
         image: postgres:10.8
diff --git a/planemo/shed2tap/base.py b/planemo/shed2tap/base.py
index 18ea0fbeb..74ef6945d 100644
--- a/planemo/shed2tap/base.py
+++ b/planemo/shed2tap/base.py
@@ -298,7 +298,7 @@ def __init__(self, name, version, repo):
 
 class BaseAction:
     _keys: List[str] = []
-    action_type = None  # type: str
+    action_type: str
 
     def __repr__(self):
         return f"Action[type={self.action_type}]"
diff --git a/setup.py b/setup.py
index 029f625b6..7afb13d04 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,6 @@
 
 _version_re = re.compile(r"__version__\s+=\s+(.*)")
 
-
 with open("%s/__init__.py" % SOURCE_DIR, "rb") as f:
     init_contents = f.read().decode("utf-8")
 
@@ -40,7 +39,6 @@ def get_var(var_name):
     PROJECT_AUTHOR = get_var("PROJECT_AUTHOR")
     PROJECT_EMAIL = get_var("PROJECT_EMAIL")
 
-TEST_DIR = "tests"
 PROJECT_DESCRIPTION = (
     "Command-line utilities to assist in building tools for the Galaxy project (http://galaxyproject.org/)."
 )
@@ -90,11 +88,6 @@ def get_var(var_name):
     # In tox, it will cover them anyway.
     requirements = []
 
-test_requirements = [
-    # TODO: put package test requirements here
-]
-
-
 setup(
     name=PROJECT_NAME,
     version=version,
@@ -127,7 +120,7 @@ def get_var(var_name):
         "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",
     ],
-    test_suite=TEST_DIR,
-    tests_require=test_requirements,
 )