Merge pull request #86 from STIXProject/update-testing-versions

update testing versions

Author: rpiazza

.github/workflows/python-ci-tests.yml

@@ -0,0 +1,29 @@
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: stix-validator test harness
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
+
+    name: Python ${{ matrix.python-version }} Build
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install and update essential dependencies
+      run: |
+        pip install -U pip setuptools
+        pip install tox-gh-actions
+    - name: Test with Tox
+      run: |
+        tox

.travis.yml

@@ -8,7 +8,6 @@
 
 # external
 import lxml.etree
-from mixbox.vendor.six import iteritems, itervalues
 
 # internal
 import sdv
@@ -290,7 +289,7 @@ def print_profile_results(results, level):
     for e in results.errors:
         errors_[e.message].append(e.line)
 
-    for msg, lines in iteritems(errors_):
+    for msg, lines in errors_.items():
         lines = ', '.join(str(x) for x in lines)
         print_level("[!] %s [%s]", level+1, msg, lines)
 
@@ -303,7 +302,7 @@ def print_json_results(results):
             results to print.
     """
     json_results = {}
-    for fn, result in iteritems(results):
+    for fn, result in results.items():
         d = {}
         if result.schema_results is not None:
             d['schema validation'] = result.schema_results.as_dict()
@@ -335,7 +334,7 @@ def print_results(results, options):
         return
 
     level = 0
-    for fn, result in sorted(iteritems(results)):
+    for fn, result in sorted(results.items()):
         print("=" * 80)
         print_level("[-] Results: %s", level, fn)
 
@@ -511,7 +510,7 @@ def status_code(results):
     """
     status = codes.EXIT_SUCCESS
 
-    for result in itervalues(results):
+    for result in results.values():
         schema = result.schema_results
         best_practice = result.best_practice_results
         profile = result.profile_results

sdv/scripts/__init__.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2015, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
 
+from io import StringIO
 import unittest
-from mixbox.vendor.six import StringIO
 
 import sdv
 import sdv.errors as errors

sdv/test/cybox_schema_tests.py sdv/test/cybox_schema_test.pysdv/test/cybox_schema_tests.py renamed to sdv/test/cybox_schema_test.py

@@ -1,8 +1,9 @@
 # Copyright (c) 2015, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
+
+from io import StringIO
 import json
 import unittest
-from mixbox.vendor.six import StringIO
 
 from lxml import etree
 

sdv/test/stix_best_practices_tests.py sdv/test/stix_best_practices_test.pysdv/test/stix_best_practices_tests.py renamed to sdv/test/stix_best_practices_test.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2015, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
 
+from io import StringIO
 import unittest
-from mixbox.vendor.six import StringIO
 
 import sdv
 import sdv.errors as errors

sdv/test/stix_profile_tests.py sdv/test/stix_profile_test.pysdv/test/stix_profile_tests.py renamed to sdv/test/stix_profile_test.py

@@ -1,8 +1,8 @@
 # Copyright (c) 2015, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
 
+from io import StringIO
 import unittest
-from mixbox.vendor.six import StringIO
 
 import sdv
 import sdv.errors as errors

sdv/test/stix_schema_tests.py sdv/test/stix_schema_test.pysdv/test/stix_schema_tests.py renamed to sdv/test/stix_schema_test.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2015, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
 
+from io import StringIO
 import unittest
 import datetime
-from mixbox.vendor.six import StringIO
 
 from lxml import etree
 import dateutil.parser
@@ -146,4 +146,4 @@ def test_is_qname(self):
             self.assertTrue(utils.is_qname(s))
 
         for s in invalid:
-            self.assertEqual(False, utils.is_qname(s), msg=s)
+            self.assertEqual(False, utils.is_qname(s), msg=s)

sdv/test/utils_tests.py sdv/test/utils_test.pysdv/test/utils_tests.py renamed to sdv/test/utils_test.py

@@ -6,11 +6,11 @@
 import contextlib
 import datetime
 from distutils.version import StrictVersion
+from io import StringIO, BytesIO
 
 # external
 import dateutil.parser
 from lxml import etree
-from mixbox.vendor.six import StringIO, BytesIO
 
 # relative
 from . import errors, xmlconst
@@ -500,4 +500,4 @@ def remove_version_prefix(version):
     """
     if version.startswith('stix-'):
         version = version.partition('stix-')[2]
-    return version
+    return version

sdv/utils.py

@@ -5,9 +5,6 @@
 import abc
 import json
 
-# external
-from mixbox.vendor.six import iteritems
-
 # internal
 from .. import utils
 
@@ -93,7 +90,7 @@ def _get_validators(self, schema_dir=None):
                 self._KEY_USER_DEFINED: self._get_validator_impl(schema_dir)
             }
         else:
-            for version, location in iteritems(self._SCHEMAS):
+            for version, location in self._SCHEMAS.items():
                 validator = self._get_validator_impl(location)
                 validators[version] = validator
 
@@ -148,4 +145,4 @@ def _validate(self, doc, version=None, schemaloc=False):
     'ValidationError',
     'ValidationResults',
     'BaseSchemaValidator'
-]
+]