Merge pull request #32 from OpenDataServices/python311

Python & black

Author: James (ODSC)

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
     - uses: actions/checkout@v2
     - name: Setup python

CHANGELOG.md

@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Process anyOf and allOf and well as oneOf https://github.com/OpenDataServices/compile-to-json-schema/issues/28
 
+### Removed
+
+- Removed Python 3.5 and 3.6 support, as they aren't supported any more
+
 ## [0.4.0] - 2021-07-30
 
 ### Added

setup.py

@@ -1,11 +1,6 @@
-import sys
-
 from setuptools import find_packages, setup
 
-extras_require_test = ["pytest", "flake8", "isort"]
-
-if sys.version_info[0] >= 3 and sys.version_info[1] >= 6:
-    extras_require_test.append("black==19.10b0")
+extras_require_test = ["pytest", "flake8", "isort", "black==22.10.0"]
 
 setup(
     name="compiletojsonschema",
@@ -17,15 +12,21 @@
     license="BSD",
     packages=find_packages(),
     long_description="Command-line tools and library for doing some non-standard things with JSON Schema",
-    install_requires=["jsonref", "jsonschema",],
-    extras_require={"test": extras_require_test,},
-    python_requires=">=3.5",
+    install_requires=[
+        "jsonref",
+        "jsonschema",
+    ],
+    extras_require={
+        "test": extras_require_test,
+    },
+    python_requires=">=3.7",
     classifiers=[
         "License :: OSI Approved :: BSD License",
-        "Programming Language :: Python :: 3.5",
-        "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",
     ],
     entry_points="""[console_scripts]
 compiletojsonschema = compiletojsonschema.cli.__main__:main""",

tests/test_codelist.py

@@ -39,7 +39,9 @@ def test_basic():
     )
 
     codelist_dir = os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), "fixtures", "codelists",
+        os.path.dirname(os.path.realpath(__file__)),
+        "fixtures",
+        "codelists",
     )
 
     ctjs = CompileToJsonSchema(
@@ -60,7 +62,9 @@ def test_open_codelist():
     )
 
     codelist_dir = os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), "fixtures", "codelists",
+        os.path.dirname(os.path.realpath(__file__)),
+        "fixtures",
+        "codelists",
     )
 
     ctjs = CompileToJsonSchema(
@@ -81,7 +85,9 @@ def test_closed_codelist():
     )
 
     codelist_dir = os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), "fixtures", "codelists",
+        os.path.dirname(os.path.realpath(__file__)),
+        "fixtures",
+        "codelists",
     )
 
     ctjs = CompileToJsonSchema(

tests/test_simple.py

@@ -34,7 +34,10 @@ def test_in_file_pass_as_schema():
     )
 
     with open(input_filename) as fp:
-        input_schema = json.load(fp, object_pairs_hook=OrderedDict,)
+        input_schema = json.load(
+            fp,
+            object_pairs_hook=OrderedDict,
+        )
 
     ctjs = CompileToJsonSchema(input_schema=input_schema)
     out_string = ctjs.get_as_string()