Merge pull request #83 from BAMWelDX/73_asdf_27

update environment & dependency versions to asdf 2.7
BAMWelDX · Jul 24, 2020 · a4d623a · a4d623a
2 parents 315012f + 11e99dd
commit a4d623a
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,3 +38,5 @@
     wx_property_tag: "tag:weldx.bam.de:weldx/time/timestamp-1.0.0"  
     ```
     It can be used as a "named" mapping replacement instead of YAML `arrays`.
+- update requirements to `asdf>=2.7` [#83]
+- update `anyOf` to `oneOf` in ASDF schemas [#83]
diff --git a/environment.yml b/environment.yml
@@ -12,7 +12,7 @@ dependencies:
   - xarray>=0.15
   - pint>=0.11
   - bottleneck
-  - asdf=2.6
+  - asdf>=2.7
   - sphinx
   - recommonmark
   - openpyxl

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
     "scipy>=1.4",
     "sympy>=1.6",
     "pint>=0.11",
-    "asdf>=2.6",
+    "asdf>=2.7",
     "bottleneck>=1.3",
     "Jinja2>=2.11",
     "networkx>=2",

diff --git a/tests/test_asdf.py b/tests/test_asdf.py
@@ -30,8 +30,6 @@
 # validators -----------------------------------------------------------------
 from weldx.constants import WELDX_QUANTITY as Q_
 
-from .asdf_tests.utility import _write_read_buffer
-
 
 def test_aws_example():
     """Test validity of current AWS Data Dictionary standard implementation."""

diff --git a/weldx/asdf/schemas/weldx.bam.de/weldx/aws/design/weld_details-1.0.0.yaml b/weldx/asdf/schemas/weldx.bam.de/weldx/aws/design/weld_details-1.0.0.yaml
@@ -13,12 +13,12 @@ properties:
   joint_design:
     description: |
       AWS 3.0, p. 19 : "Detailed Description of mating configuration of two components, sufficient information for shop preparation of the components." TODO CLASS
-    $ref: ../../core/iso_groove-1.0.0
+    tag: "tag:weldx.bam.de:weldx/core/iso_groove-1.0.0"
 
   weld_sizes:
     description: |
       Linear dimensions of cross sectional weld features. Sizes are of design and actual features. TODO CLASS
-    -$ref: tag:stsci.edu:asdf/unit/quantity-1.1.0
+    tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
 
   number_of_passes:
     description: |

diff --git a/weldx/asdf/schemas/weldx.bam.de/weldx/core/iso_groove-1.0.0.yaml b/weldx/asdf/schemas/weldx.bam.de/weldx/core/iso_groove-1.0.0.yaml
@@ -53,7 +53,7 @@ definitions:
       Special depth
     $ref: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
 
-anyOf:
+oneOf:
   # I Groove
   - type: object
     properties:
@@ -70,13 +70,11 @@ anyOf:
           code_number:
             type: array
         required: [t, b]
-        additionalProperties: false
         wx_unit:
           t: "m"
           b: "m"
     required: [type, components]
     propertyOrder: [type, components]
-    additionalProperties: true
 
   # Single U Groove
   - type: object

diff --git a/weldx/asdf/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml b/weldx/asdf/schemas/weldx.bam.de/weldx/measurement/error-1.0.0.yaml
@@ -13,7 +13,7 @@ properties:
   deviation:
     description: |
       A simple numerical representation of the error.
-    anyOf:
+    oneOf:
       - type: number
       - $ref: tag:stsci.edu:asdf/unit/quantity-1.1.0
 

diff --git a/weldx/asdf/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml b/weldx/asdf/schemas/weldx.bam.de/weldx/time/datetimeindex-1.0.0.yaml
@@ -40,7 +40,7 @@ definitions:
       Maximum timestamp in the index.
     $ref: timestamp-1.0.0
 
-anyOf:
+oneOf:
   - type: object
     properties:
       values:

diff --git a/weldx/asdf/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml b/weldx/asdf/schemas/weldx.bam.de/weldx/time/timedeltaindex-1.0.0.yaml
@@ -40,7 +40,7 @@ definitions:
       Maximum timedelta in the index.
     $ref: timedelta-1.0.0
 
-anyOf:
+oneOf:
   - type: object
     properties:
       values:

diff --git a/weldx/transformations.py b/weldx/transformations.py
@@ -384,15 +384,11 @@ def __init__(
                 # TODO: Test if xarray has correct format
                 pass
 
-            # TODO: Remove the deepcopy when asdf 2.7.0 is available
-            #  - the copy circumvents an asdf bug
-            orientation = deepcopy(
-                xr.apply_ufunc(
-                    normalize,
-                    orientation,
-                    input_core_dims=[["c"]],
-                    output_core_dims=[["c"]],
-                )
+            orientation = xr.apply_ufunc(
+                normalize,
+                orientation,
+                input_core_dims=[["c"]],
+                output_core_dims=[["c"]],
             )
 
             # unify time axis