Add support for python 3.10 and 3.11 (#16)

* Add support for python 3.10 and 3.11
* move kafka tests, update their README

.github/workflows/main.yml

@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v2

.python-version

@@ -1,3 +1,5 @@
+3.11.4
+3.10.12
 3.9.7
 3.8.12
 3.7.12

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = aws-glue-schema-registry
-version = 1.1.2
+version = 1.1.3
 description = Use the AWS Glue Schema Registry.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -34,7 +34,8 @@ install_requires =
     boto3>=1.17.102
     typing-extensions>=3.7.4.3;python_version<"3.8"
     fastavro>=1.4.5
-    orjson~=3.6.0
+    orjson~=3.6.0;python_version<"3.11"
+    orjson>=3.7.7;python_version>="3.11"
     fastjsonschema~=2.15
 setup_requires =
     setuptools

src/aws_schema_registry/adapter/kafka.py

@@ -3,7 +3,7 @@
 https://pypi.org/project/kafka-python/
 """
 
-from kafka import Serializer, Deserializer
+from kafka.serializer import Serializer, Deserializer
 
 from aws_schema_registry import (
     KafkaSerializer as _KafkaSerializer,

src/aws_schema_registry/client.py

@@ -3,7 +3,7 @@
 import time
 import random
 import string
-from typing import ContextManager, Mapping
+from typing import ContextManager, Mapping, Optional
 from uuid import UUID
 
 from aws_schema_registry.schema import (
@@ -138,7 +138,7 @@ def get_or_register_schema_version(
         schema_name: str,
         data_format: DataFormat,
         compatibility_mode: CompatibilityMode = DEFAULT_COMPATIBILITY_MODE,
-        metadata: Mapping[str, str] = None
+        metadata: Optional[Mapping[str, str]] = None
     ) -> SchemaVersion:
         """Get Schema Version ID by following below steps:
 
@@ -193,7 +193,7 @@ def register_schema_version(
         self,
         definition: str,
         schema_name: str,
-        metadata: Mapping[str, str] = None
+        metadata: Optional[Mapping[str, str]] = None
     ) -> UUID:
         """Register a new version to an existing schema.
 
@@ -281,7 +281,7 @@ def create_schema(
         data_format: DataFormat,
         definition: str,
         compatibility_mode: CompatibilityMode = DEFAULT_COMPATIBILITY_MODE,
-        metadata: Mapping[str, str] = None
+        metadata: Optional[Mapping[str, str]] = None
     ) -> UUID:
         """Create a new schema and return the version id."""
         try:

tests/integration/kafka_test/README.md

@@ -0,0 +1,7 @@
+# Kafka integration tests
+
+Tests that the serializer and deserializer works correctly with a real Kafka cluster.
+
+Requires [Docker](https://www.docker.com/). Tested with Docker v20.
+
+Run `docker compose -f tests/integration/kafka_test/docker-compose.yml up -d` before running these tests. Destroy the docker stack with `docker compose -f tests/integration/kafka_test/docker-compose.yml down`.

tests/test_jsonschema.py

@@ -78,9 +78,12 @@ def test_validation():
       ]
     }""")
 
-    with pytest.raises(ValidationError, match=re.escape(
-        "data must contain ['name', 'age'] properties"
-    )):
+    with pytest.raises(
+        ValidationError,
+        # fastjsonschema>=2.18.0 reports only missing properties, so it will
+        # exclude 'name'
+        match=r"data must contain \[('name', )?'age'\] properties"
+    ):
         s.validate({'name': 'Obi-Wan'})
     with pytest.raises(ValidationError, match=re.escape(
         "data.name must be string"

tox.ini

@@ -1,11 +1,13 @@
 [tox]
-envlist = flake8,mypy,py37,py38,py39
+envlist = flake8,mypy,py37,py38,py39,py310,py311
 
 [gh-actions]
 python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
+    3.11: py311
 
 [testenv]
 deps = pytest