diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
index c7049437a32..f0d4801e712 100644
--- a/.github/workflows/test-lang-java.yml
+++ b/.github/workflows/test-lang-java.yml
@@ -43,7 +43,6 @@ jobs:
- '8'
- '11'
- '17'
- - '18'
- '19'
steps:
- uses: actions/checkout@v2
@@ -152,4 +151,4 @@ jobs:
- name: Test Reproducible Build
working-directory: .
- run: mvn clean verify -DskipTests artifact:compare
+ run: mvn clean verify -DskipTests -Dcyclonedx.skip artifact:compare
diff --git a/lang/py/avro/io.py b/lang/py/avro/io.py
index 998dcd863a8..7b5576697eb 100644
--- a/lang/py/avro/io.py
+++ b/lang/py/avro/io.py
@@ -482,7 +482,7 @@ def write_decimal_bytes(self, datum: decimal.Decimal, scale: int) -> None:
signed long is 8, 8 bytes are written.
"""
sign, digits, exp = datum.as_tuple()
- if (-1 * exp) > scale:
+ if (-1 * int(exp)) > scale:
raise avro.errors.AvroOutOfScaleException(scale, datum, exp)
unscaled_datum = 0
@@ -508,7 +508,7 @@ def write_decimal_fixed(self, datum: decimal.Decimal, scale: int, size: int) ->
Decimal in fixed are encoded as size of fixed bytes.
"""
sign, digits, exp = datum.as_tuple()
- if (-1 * exp) > scale:
+ if (-1 * int(exp)) > scale:
raise avro.errors.AvroOutOfScaleException(scale, datum, exp)
unscaled_datum = 0
diff --git a/lang/py/avro/test/test_compatibility.py b/lang/py/avro/test/test_compatibility.py
index 3c36b6f846d..e9af424e919 100644
--- a/lang/py/avro/test/test_compatibility.py
+++ b/lang/py/avro/test/test_compatibility.py
@@ -691,7 +691,7 @@ def test_schema_compatibility(self):
(WITHOUT_NAMESPACE_RECORD, WITH_NAMESPACE_RECORD),
]
- for (reader, writer) in compatible_reader_writer_test_cases:
+ for reader, writer in compatible_reader_writer_test_cases:
self.assertTrue(self.are_compatible(reader, writer))
def test_schema_compatibility_fixed_size_mismatch(self):
@@ -711,7 +711,7 @@ def test_schema_compatibility_fixed_size_mismatch(self):
"/fields/1/type/size",
),
]
- for (reader, writer, message, location) in incompatible_fixed_pairs:
+ for reader, writer, message, location in incompatible_fixed_pairs:
result = ReaderWriterCompatibilityChecker().get_compatibility(reader, writer)
self.assertIs(result.compatibility, SchemaCompatibilityType.incompatible)
self.assertIn(
@@ -737,7 +737,7 @@ def test_schema_compatibility_missing_enum_symbols(self):
"/fields/0/type/symbols",
),
]
- for (reader, writer, message, location) in incompatible_pairs:
+ for reader, writer, message, location in incompatible_pairs:
result = ReaderWriterCompatibilityChecker().get_compatibility(reader, writer)
self.assertIs(result.compatibility, SchemaCompatibilityType.incompatible)
self.assertIn(message, result.messages)
@@ -853,7 +853,7 @@ def test_schema_compatibility_missing_union_branch(self):
),
]
- for (reader, writer, message, location) in incompatible_pairs:
+ for reader, writer, message, location in incompatible_pairs:
result = ReaderWriterCompatibilityChecker().get_compatibility(reader, writer)
self.assertIs(result.compatibility, SchemaCompatibilityType.incompatible)
self.assertEqual(result.messages, message)
@@ -872,7 +872,7 @@ def test_schema_compatibility_name_mismatch(self):
),
]
- for (reader, writer, message, location) in incompatible_pairs:
+ for reader, writer, message, location in incompatible_pairs:
result = ReaderWriterCompatibilityChecker().get_compatibility(reader, writer)
self.assertIs(result.compatibility, SchemaCompatibilityType.incompatible)
self.assertIn(message, result.messages)
@@ -883,7 +883,7 @@ def test_schema_compatibility_reader_field_missing_default_value(self):
(A_INT_RECORD1, EMPTY_RECORD1, "a", "/fields/0"),
(A_INT_B_DINT_RECORD1, EMPTY_RECORD1, "a", "/fields/0"),
]
- for (reader, writer, message, location) in incompatible_pairs:
+ for reader, writer, message, location in incompatible_pairs:
result = ReaderWriterCompatibilityChecker().get_compatibility(reader, writer)
self.assertIs(result.compatibility, SchemaCompatibilityType.incompatible)
self.assertEqual(len(result.messages), 1)
@@ -1063,7 +1063,7 @@ def test_schema_compatibility_type_mismatch(self):
"/",
),
]
- for (reader, writer, message, location) in incompatible_pairs:
+ for reader, writer, message, location in incompatible_pairs:
result = ReaderWriterCompatibilityChecker().get_compatibility(reader, writer)
self.assertIs(result.compatibility, SchemaCompatibilityType.incompatible)
self.assertIn(message, result.messages)
diff --git a/lang/py/avro/test/test_datafile_interop.py b/lang/py/avro/test/test_datafile_interop.py
index d9e4c690daf..7dec16e7810 100644
--- a/lang/py/avro/test/test_datafile_interop.py
+++ b/lang/py/avro/test/test_datafile_interop.py
@@ -42,7 +42,6 @@ def test_interop(self) -> None:
continue
i = None
with self.subTest(filename=filename), avro.datafile.DataFileReader(filename.open("rb"), avro.io.DatumReader()) as dfr:
-
user_metadata = dfr.get_meta("user_metadata")
if user_metadata is not None:
self.assertEqual(user_metadata, b"someByteArray")
diff --git a/lang/py/avro/test/test_io.py b/lang/py/avro/test/test_io.py
index 29dd82130ce..b77c17fb98b 100644
--- a/lang/py/avro/test/test_io.py
+++ b/lang/py/avro/test/test_io.py
@@ -450,7 +450,6 @@ def check_default_value(self) -> None:
class TestIncompatibleSchemaReading(unittest.TestCase):
def test_deserialization_fails(self) -> None:
-
reader_schema = avro.schema.parse(
json.dumps(
{
@@ -505,7 +504,7 @@ def test_decimal_bytes_small_scale(self) -> None:
"""Avro should raise an AvroTypeException when attempting to write a decimal with a larger exponent than the schema's scale."""
datum = decimal.Decimal("3.1415")
_, _, exp = datum.as_tuple()
- scale = -1 * exp - 1
+ scale = -1 * int(exp) - 1
schema = avro.schema.parse(
json.dumps(
{
@@ -522,7 +521,7 @@ def test_decimal_fixed_small_scale(self) -> None:
"""Avro should raise an AvroTypeException when attempting to write a decimal with a larger exponent than the schema's scale."""
datum = decimal.Decimal("3.1415")
_, _, exp = datum.as_tuple()
- scale = -1 * exp - 1
+ scale = -1 * int(exp) - 1
schema = avro.schema.parse(
json.dumps(
{
diff --git a/lang/py/avro/test/test_schema.py b/lang/py/avro/test/test_schema.py
index 8286567f9ff..c59ded8a73e 100644
--- a/lang/py/avro/test/test_schema.py
+++ b/lang/py/avro/test/test_schema.py
@@ -662,7 +662,7 @@ def parse_valid(self) -> None:
try:
warnings.filterwarnings(action="error", category=avro.errors.IgnoredLogicalType)
self.test_schema.parse()
- except (avro.errors.IgnoredLogicalType) as e:
+ except avro.errors.IgnoredLogicalType as e:
self.assertIn(type(e), (type(w) for w in test_warnings))
self.assertIn(str(e), (str(w) for w in test_warnings))
except (avro.errors.AvroException, avro.errors.SchemaParseException): # pragma: no coverage
diff --git a/lang/py/avro/tether/tether_task.py b/lang/py/avro/tether/tether_task.py
index dc138d07d70..c521fa56b4c 100644
--- a/lang/py/avro/tether/tether_task.py
+++ b/lang/py/avro/tether/tether_task.py
@@ -300,7 +300,6 @@ def configure(self, taskType, inSchemaText, outSchemaText):
self._red_fkeys = [f.name for f in self.midschema.fields if not (f.order == "ignore")]
except Exception as e:
-
estr = traceback.format_exc()
self.fail(estr)
@@ -335,7 +334,6 @@ def input(self, data, count):
self.map(inRecord, self.midCollector)
elif self.taskType == TaskType.REDUCE:
-
# store the previous record
prev = self.midRecord
diff --git a/pom.xml b/pom.xml
index 1ee27bccd6c..c1ca31dacaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
3.0.0
3.4.1
3.2.1
- 3.7.0
+ 3.5.2
2.27.2
3.0.0