From 01451f9fc790b175e6b6404c569cd9c717630993 Mon Sep 17 00:00:00 2001
From: Matej Spiller Muys <matej.spiller@gmail.com>
Date: Mon, 9 Dec 2024 18:37:14 +0100
Subject: [PATCH] Require astunparse only for older python versions

---
 python/requirements.in                    | 2 +-
 python/setup.cfg                          | 7 ++++++-
 tests/harness/python/requirements_test.py | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/python/requirements.in b/python/requirements.in
index 29cb02904..ef6573917 100644
--- a/python/requirements.in
+++ b/python/requirements.in
@@ -4,4 +4,4 @@
 validate-email>=1.3
 Jinja2>=2.11.1
 protobuf>=5.27.0
-astunparse>=1.6.3
+astunparse>=1.6.3; python_version<"3.10"
diff --git a/python/setup.cfg b/python/setup.cfg
index 21b531228..a35a464d4 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -14,6 +14,11 @@ classifiers =
     Programming Language :: Python :: 3.6
     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 :: 3.13
 
 [options]
 packages = find:
@@ -21,7 +26,7 @@ install_requires =
     validate-email>=1.3
     Jinja2>=2.11.1
     protobuf>=5.27.0
-    astunparse>=1.6.3
+    astunparse>=1.6.3; python_version<"3.10"
 python_requires = >=3.6
 
 [options.data_files]
diff --git a/tests/harness/python/requirements_test.py b/tests/harness/python/requirements_test.py
index 2aac6fe04..f498c4147 100755
--- a/tests/harness/python/requirements_test.py
+++ b/tests/harness/python/requirements_test.py
@@ -15,10 +15,10 @@
 
 with open('python/requirements.in', 'r') as reqs:
     lines = reqs.readlines()
-    requirements_dot_in_set = {line.strip() for line in lines if line.strip() and not line.startswith("#")}
+    requirements_dot_in_set = {line.strip('\n') for line in lines if line.strip() and not line.startswith("#")}
 
 config = configparser.ConfigParser()
 config.read('python/setup.cfg')
-setup_dot_cfg_set = {line for line in config['options']['install_requires'].split() if not line.startswith("#")}
+setup_dot_cfg_set = {line for line in config['options']['install_requires'].split('\n') if line and not line.startswith("#")}
 
 assert requirements_dot_in_set == setup_dot_cfg_set