Merge pull request #839 from compas-dev/data

Update data module and add schemas

Author: tomvanmele

.bumpversion.cfg

@@ -8,15 +8,7 @@ tag = True
 search = version='{current_version}'
 replace = version='{new_version}'
 
-[bumpversion:file:schemas/graph.json]
-search = "$compas": "{current_version}"
-replace = "$compas": "{new_version}"
-
-[bumpversion:file:schemas/halfedge.json]
-search = "$compas": "{current_version}"
-replace = "$compas": "{new_version}"
-
-[bumpversion:file:schemas/halfface.json]
+[bumpversion:glob:schemas/*.json]
 search = "$compas": "{current_version}"
 replace = "$compas": "{new_version}"
 

CHANGELOG.md

@@ -11,13 +11,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Added `compas.topology.astar_lightest_path`.
+* Added jsonschema definitions for primitives and transformations.
+* Added schema implementation to primitives and transformations.
+* Added jsonschema implementation to primitives and transformations.
+* Added `compas.data.is_int3`, `compas.data.is_float3`, `compas_data.is_float4x4`.
 
 ### Changed
 
 * Extended `compas.topology.astar_shortest_path` to work on `compas.datastructures.Mesh` and `compas.datastructures.Network`.
+* Fixed `compas.data.Data.to_jsonstring`.
+* Changed `compas.data.Data.data.setter` to raise `NotImplementedError`.
+* Changed annotations of `compas_blender.artists.BaseArtist`.
+* Fixed `__repr__` for primitives, shapes, transformations.
 
 ### Removed
 
+* Removed duplicate cases from `compas.data.DataEncoder`.
 
 ## [1.6.2] 2021-05-12
 

requirements-dev.txt

@@ -1,6 +1,6 @@
 autopep8
 attrs >=17.4
-bump2version >=0.5.11
+bump2version >=1.0.1
 check-manifest >=0.36
 doc8
 flake8

schemas/circle.json

@@ -0,0 +1,20 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/circle.json",
+    "$compas": "1.6.2",
+
+    "type": "object",
+    "properties": {
+        "plane": {
+            "type": "array",
+            "minItems": 2,
+            "maxItems": 2,
+            "items": [
+                {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}},
+                {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}}
+            ]
+        },
+        "radius": {"type": "number", "exclusiveMinimum": 0}
+    },
+    "required": ["plane", "radius"]
+}

schemas/ellipse.json

@@ -0,0 +1,21 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/ellipse.json",
+    "$compas": "1.6.2",
+
+    "type": "object",
+    "properties": {
+        "plane": {
+            "type": "array",
+            "minItems": 2,
+            "maxItems": 2,
+            "items": [
+                {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}},
+                {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}}
+            ]
+        },
+        "major": {"type": "number", "exclusiveMinimum": 0},
+        "minor": {"type": "number", "exclusiveMinimum": 0}
+    },
+    "required": ["plane", "major", "minor"]
+}

schemas/frame.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/frame.json",
+    "$compas": "1.6.2",
+
+    "type": "object",
+    "properties": {
+        "point": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}},
+        "xaxis": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}},
+        "yaxis": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}}
+    },
+    "required": ["point", "xaxis", "yaxis"]
+}

schemas/line.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/line.json",
+    "$compas": "1.6.2",
+
+    "type": "object",
+    "properties": {
+        "start": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}},
+        "end": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}}
+    },
+    "required": ["start", "end"]
+}

schemas/plane.json

@@ -0,0 +1,12 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/plane.json",
+    "$compas": "1.6.2",
+
+    "type": "object",
+    "properties": {
+        "point": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}},
+        "normal": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}}
+    },
+    "required": ["point", "normal"]
+}

schemas/point.json

@@ -0,0 +1,10 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/point.json",
+    "$compas": "1.6.2",
+
+    "type": "array",
+    "minItems": 3,
+    "maxItems": 3,
+    "items": {"type": "number"}
+}

schemas/polygon.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://github.com/compas-dev/compas/schemas/polygon.json",
+    "$compas": "1.6.2",
+
+    "type": "object",
+    "properties": {
+        "points": {"type": "array", "minItems": 2, "items": {"type": "array", "minItems": 3, "maxItems": 3, "items": {"type": "number"}}}
+    },
+    "required": ["points"]
+}