From 0541655746addc93d58f5b14a24f012423ab1fd1 Mon Sep 17 00:00:00 2001
From: Rich Piazza <rpiazza@mitre.org>
Date: Thu, 1 Feb 2024 10:44:32 -0500
Subject: [PATCH] update project metadata

---
 .github/workflows/python-ci-tests.yml | 2 +-
 .pre-commit-config.yaml               | 6 +++---
 README.rst                            | 6 +++---
 setup.py                              | 5 +++--
 stix2slider/convert_pattern.py        | 3 +--
 tox.ini                               | 7 ++++---
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/python-ci-tests.yml b/.github/workflows/python-ci-tests.yml
index 373e5a1..af4fe06 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.8, 3.9, '3.10', '3.11', '3.12']
 
     name: Python ${{ matrix.python-version }} Build
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 18c372c..0d7cb6a 100755
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,12 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.5.0
     hooks:
     -   id: trailing-whitespace
         exclude_types: [xml, json]
     -   id: check-merge-conflict
 -   repo: https://github.com/PyCQA/flake8
-    rev: 3.8.4
+    rev: 7.0.0
     hooks:
     -   id: flake8
         name: Check project styling
@@ -14,7 +14,7 @@ repos:
         - --max-line-length=160
         - --ignore=F403,F405,W504
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.7.0
+    rev: 5.13.2
     hooks:
     -   id: isort
         name: Sort python imports (shows diff)
diff --git a/README.rst b/README.rst
index 9ebbb9c..2af4382 100644
--- a/README.rst
+++ b/README.rst
@@ -35,7 +35,7 @@ ReadTheDocs.
 Requirements
 ------------
 
-- Python 3.7+
+- Python 3.8+
 - `python-stix <https://stix.readthedocs.io/en/stable/>`_ and its dependencies
 
   .. note::
@@ -45,8 +45,8 @@ Requirements
       1.2.0.x, depending on whether you want to support STIX 1.1.1 or
       STIX 1.2.
 
--  `python-stix2 <https://pypi.org/project/python-stix2>`_ >= 2.0.0
--  `stixmarx <https://pypi.org/project/stixmarx>`_ >= 1.0.7
+-  `python-stix2 <https://pypi.org/project/python-stix2>`_ >= 3.0.0
+-  `stixmarx <https://pypi.org/project/stixmarx>`_ >= 1.0.8
 -  `stix-validator <https://pypi.org/project/stix-validator>`_ >= 2.5.0
 
 Installation
diff --git a/setup.py b/setup.py
index f32dab7..d683a25 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ def get_long_description():
 setup(
     name='stix2-slider',
     version=get_version(),
-    description='Utilities to downgrade STIX and CybOX content to 1.X',
+    description='Utilities to downgrade STIX 2.1 content to STIX 1.X and CyBOX 2.1',
     long_description=get_long_description(),
     long_description_content_type='text/x-rst',
     url='https://oasis-open.github.io/cti-documentation/',
@@ -52,10 +52,11 @@ def get_long_description():
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
-        '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'
     ],
     keywords='stix stix2 json xml cti cyber threat intelligence',
     project_urls={
diff --git a/stix2slider/convert_pattern.py b/stix2slider/convert_pattern.py
index 4679248..1e56bb0 100755
--- a/stix2slider/convert_pattern.py
+++ b/stix2slider/convert_pattern.py
@@ -55,8 +55,7 @@
 from cybox.objects.win_service_object import ServiceDescriptionList, WinService
 from cybox.objects.win_user_account_object import WinUser
 from cybox.objects.x509_certificate_object import (
-    RSAPublicKey, SubjectPublicKey, X509Cert, X509Certificate,
-    X509V3Extensions
+    RSAPublicKey, SubjectPublicKey, X509Cert, X509Certificate, X509V3Extensions
 )
 import stix2
 from stix2.patterns import (
diff --git a/tox.ini b/tox.ini
index 4fa23cb..5529bd4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py{37,38,39,310}-stix{20,21},packaging,pre-commit-check
+envlist = py{38,39,310,311,312}-stix{20,21},packaging,pre-commit-check
 
 [testenv]
 deps =
-    -U
     tox
     pytest
     pytest-cov
@@ -33,8 +32,10 @@ commands =
 python =
   3.7: py37
   3.8: py38
-  3.9: py39, packaging, pre-commit-check
+  3.9: py39
   3.10: py310
+  3.11: py311, packaging, pre-commit-check
+  3.12: py312
 
 [gh-actions:env]
 VERSION =