From 514fccdc4f5ac2d2a7ed954ad4f2a1ff9fdf8dfc Mon Sep 17 00:00:00 2001
From: Joshua <jweiss@mitre.org>
Date: Fri, 29 Jul 2022 10:31:15 -0400
Subject: [PATCH 1/2] added python 3.10 to test_harness removed 3.6

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

diff --git a/.github/workflows/python-ci-tests.yml b/.github/workflows/python-ci-tests.yml
index b74c082..2a4fd13 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 d8ec9cf..ba479d3 100644
--- a/setup.py
+++ b/setup.py
@@ -54,10 +54,10 @@ def get_long_description():
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
-        '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 xml cti cyber threat intelligence',
     project_urls={
diff --git a/tox.ini b/tox.ini
index 0f7fcaa..4fa23cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38,39}-stix{20,21},packaging,pre-commit-check
+envlist = py{37,38,39,310}-stix{20,21},packaging,pre-commit-check
 
 [testenv]
 deps =
@@ -31,10 +31,10 @@ commands =
 
 [gh-actions]
 python =
-  3.6: py36
   3.7: py37
   3.8: py38
   3.9: py39, packaging, pre-commit-check
+  3.10: py310
 
 [gh-actions:env]
 VERSION =

From 0805c39e96e0c1c02fbb147afa7ab9d8cf8aca69 Mon Sep 17 00:00:00 2001
From: Joshua Weiss <89481736+jweissm@users.noreply.github.com>
Date: Mon, 1 Aug 2022 09:35:32 -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 2a4fd13..373e5a1 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: