structurize 2.18.2__tar.gz → 2.19.0__tar.gz

{structurize-2.18.2/structurize.egg-info → structurize-2.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structurize
-Version: 2.18.2
+Version: 2.19.0
 Summary: Tools to convert from and to JSON Structure from various other schema languages.
 Author-email: Clemens Vasters <clemensv@microsoft.com>
 Classifier: Programming Language :: Python :: 3

{structurize-2.18.2 → structurize-2.19.0}/avrotize/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.18.2'
-__version_tuple__ = version_tuple = (2, 18, 2)
+__version__ = version = '2.19.0'
+__version_tuple__ = version_tuple = (2, 19, 0)
 
-__commit_id__ = commit_id = 'g857734aaf'
+__commit_id__ = commit_id = 'geec8f9840'

{structurize-2.18.2 → structurize-2.19.0}/avrotize/avrotocsharp.py

@@ -9,6 +9,15 @@ from typing import Any, Dict, List, Tuple, Union, cast
 import uuid
 
 from avrotize.common import build_flat_type_dict, inline_avro_references, is_generic_avro_type, pascal, process_template
+from avrotize.constants import (
+    CSHARP_AVRO_VERSION,
+    NEWTONSOFT_JSON_VERSION,
+    SYSTEM_TEXT_JSON_VERSION,
+    SYSTEM_MEMORY_DATA_VERSION,
+    NUNIT_VERSION,
+    NUNIT_ADAPTER_VERSION,
+    MSTEST_SDK_VERSION,
+)
 import glob
 
 JsonNode = Dict[str, 'JsonNode'] | List['JsonNode'] | str | None
@@ -957,7 +966,14 @@ class AvroToCSharp:
                         avro_annotation=self.avro_annotation,
                         system_xml_annotation=self.system_xml_annotation,
                         system_text_json_annotation=self.system_text_json_annotation,
-                        newtonsoft_json_annotation=self.newtonsoft_json_annotation))
+                        newtonsoft_json_annotation=self.newtonsoft_json_annotation,
+                        CSHARP_AVRO_VERSION=CSHARP_AVRO_VERSION,
+                        NEWTONSOFT_JSON_VERSION=NEWTONSOFT_JSON_VERSION,
+                        SYSTEM_TEXT_JSON_VERSION=SYSTEM_TEXT_JSON_VERSION,
+                        SYSTEM_MEMORY_DATA_VERSION=SYSTEM_MEMORY_DATA_VERSION,
+                        NUNIT_VERSION=NUNIT_VERSION,
+                        NUNIT_ADAPTER_VERSION=NUNIT_ADAPTER_VERSION,
+                        MSTEST_SDK_VERSION=MSTEST_SDK_VERSION))
         if not glob.glob(os.path.join(output_dir, "test", "*.csproj")):
             csproj_test_file = os.path.join(
                 output_dir, "test", f"{pascal(project_name)}.Test.csproj")
@@ -971,7 +987,10 @@ class AvroToCSharp:
                         avro_annotation=self.avro_annotation,
                         system_xml_annotation=self.system_xml_annotation,
                         system_text_json_annotation=self.system_text_json_annotation,
-                        newtonsoft_json_annotation=self.newtonsoft_json_annotation))
+                        newtonsoft_json_annotation=self.newtonsoft_json_annotation,
+                        NUNIT_VERSION=NUNIT_VERSION,
+                        NUNIT_ADAPTER_VERSION=NUNIT_ADAPTER_VERSION,
+                        MSTEST_SDK_VERSION=MSTEST_SDK_VERSION))
 
         self.output_dir = output_dir
         for avro_schema in (avs for avs in schema if isinstance(avs, dict)):

{structurize-2.18.2 → structurize-2.19.0}/avrotize/avrotojava.py

@@ -4,7 +4,8 @@
 import json
 import os
 from typing import Dict, List, Tuple, Union
-from avrotize.constants import AVRO_VERSION, JACKSON_VERSION, JDK_VERSION
+from avrotize.constants import (AVRO_VERSION, JACKSON_VERSION, JDK_VERSION, 
+                                  JUNIT_VERSION, MAVEN_COMPILER_VERSION, MAVEN_SUREFIRE_VERSION)
 
 from avrotize.common import pascal, camel, is_generic_avro_type, inline_avro_references, build_flat_type_dict
 
@@ -46,13 +47,13 @@ POM_CONTENT = """<?xml version="1.0" encoding="UTF-8"?>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.0</version>
+            <version>{JUNIT_VERSION}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.0</version>
+            <version>{JUNIT_VERSION}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -61,7 +62,7 @@ POM_CONTENT = """<?xml version="1.0" encoding="UTF-8"?>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>{MAVEN_COMPILER_VERSION}</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-Xmaxerrs</arg>
@@ -72,7 +73,7 @@ POM_CONTENT = """<?xml version="1.0" encoding="UTF-8"?>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M9</version>
+                <version>{MAVEN_SUREFIRE_VERSION}</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -2092,7 +2093,16 @@ class AvroToJava:
             groupid = '.'.join(package_elements[:-1]) if len(package_elements) > 1 else package_elements[0]
             artifactid = package_elements[-1]
             with open(pom_path, 'w', encoding='utf-8') as file:
-                file.write(POM_CONTENT.format(groupid=groupid, artifactid=artifactid, AVRO_VERSION=AVRO_VERSION, JACKSON_VERSION=JACKSON_VERSION, JDK_VERSION=JDK_VERSION, PACKAGE=self.base_package))
+                file.write(POM_CONTENT.format(
+                    groupid=groupid, 
+                    artifactid=artifactid, 
+                    AVRO_VERSION=AVRO_VERSION, 
+                    JACKSON_VERSION=JACKSON_VERSION, 
+                    JDK_VERSION=JDK_VERSION, 
+                    JUNIT_VERSION=JUNIT_VERSION,
+                    MAVEN_COMPILER_VERSION=MAVEN_COMPILER_VERSION,
+                    MAVEN_SUREFIRE_VERSION=MAVEN_SUREFIRE_VERSION,
+                    PACKAGE=self.base_package))
         output_dir = os.path.join(
             output_dir, "src/main/java".replace('/', os.sep))
         if not os.path.exists(output_dir):