From 07dddd1ac1fda6356155a1a8dd3e7859eec11077 Mon Sep 17 00:00:00 2001
From: jweissm <jweiss@mitre.org>
Date: Fri, 29 Jul 2022 07:22:46 -0700
Subject: [PATCH 1/2] added python 3.10 to test harness removed 3.6

---
 .github/workflows/python-ci-tests.yml | 2 +-
 setup.py                              | 4 ++--
 tox.ini                               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python-ci-tests.yml b/.github/workflows/python-ci-tests.yml
index dc9ccc0..edb2c4b 100644
--- a/.github/workflows/python-ci-tests.yml
+++ b/.github/workflows/python-ci-tests.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, 3.10]
 
     name: Python ${{ matrix.python-version }} Build
     steps:
diff --git a/setup.py b/setup.py
index f383ebd..bf01b13 100644
--- a/setup.py
+++ b/setup.py
@@ -40,14 +40,14 @@ setup(
         'Topic :: Security',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python :: 3',
-        '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',
     ],
     keywords='stix stix2 json cti cyber threat intelligence',
     packages=find_packages(exclude=['*.test', '*.test.*']),
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=[
         'pytz',
         'requests',
diff --git a/tox.ini b/tox.ini
index 90f5cfc..2697458 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,packaging,pre-commit-check
+envlist = py37,py38,py39,py310,packaging,pre-commit-check
 
 [testenv]
 deps =
@@ -32,7 +32,7 @@ commands =
 
 [gh-actions]
 python =
-  3.6: py36
   3.7: py37
   3.8: py38
   3.9: py39, packaging, pre-commit-check
+  3.10: py310

From aab27b6559c449c85cfc3e422dcfcf7e8a7edf6c Mon Sep 17 00:00:00 2001
From: Joshua Weiss <89481736+jweissm@users.noreply.github.com>
Date: Mon, 1 Aug 2022 09:48:21 -0400
Subject: [PATCH 2/2] Update python-ci-tests.yml

---
 .github/workflows/python-ci-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-ci-tests.yml b/.github/workflows/python-ci-tests.yml
index edb2c4b..211aa4c 100644
--- a/.github/workflows/python-ci-tests.yml
+++ b/.github/workflows/python-ci-tests.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, 3.10]
+        python-version: [3.7, 3.8, 3.9, '3.10']
 
     name: Python ${{ matrix.python-version }} Build
     steps: