Skip to content

Commit

Permalink
Regenerate nxdls with nyaml==0.0.8 (#190)
Browse files Browse the repository at this point in the history
* Pin nyaml==0.0.8

* Regenerate nxdls
# Conflicts:
#	contributed_definitions/NXapm.nxdl.xml
#	contributed_definitions/NXapm_charge_state_analysis.nxdl.xml
#	contributed_definitions/NXapm_hit_finding.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_clusterer_config.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_clusterer_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_distancer_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_intersector_config.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_intersector_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_nanochem_config.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_nanochem_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_ranger_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_selector_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_spatstat_config.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_spatstat_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_surfacer_config.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_surfacer_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_tessellator_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_tool_results.nxdl.xml
#	contributed_definitions/NXapm_paraprobe_transcoder_results.nxdl.xml
#	contributed_definitions/NXapm_ranging.nxdl.xml
#	contributed_definitions/NXapm_reconstruction.nxdl.xml
#	contributed_definitions/NXapm_volt_and_bowl.nxdl.xml
#	contributed_definitions/NXcg_alpha_complex.nxdl.xml
#	contributed_definitions/NXcg_cylinder_set.nxdl.xml
#	contributed_definitions/NXcg_face_list_data_structure.nxdl.xml
#	contributed_definitions/NXcg_grid.nxdl.xml
#	contributed_definitions/NXcg_half_edge_data_structure.nxdl.xml
#	contributed_definitions/NXcg_hexahedron_set.nxdl.xml
#	contributed_definitions/NXcg_parallelogram_set.nxdl.xml
#	contributed_definitions/NXcg_point_set.nxdl.xml
#	contributed_definitions/NXcg_polyline_set.nxdl.xml
#	contributed_definitions/NXcg_sphere_set.nxdl.xml
#	contributed_definitions/NXcorrector_cs.nxdl.xml
#	contributed_definitions/NXdelocalization.nxdl.xml
#	contributed_definitions/NXem_conventions.nxdl.xml
#	contributed_definitions/NXem_ebsd.nxdl.xml
#	contributed_definitions/NXem_eds.nxdl.xml
#	contributed_definitions/NXevent_data_apm.nxdl.xml
#	contributed_definitions/NXgraph_edge_set.nxdl.xml
#	contributed_definitions/NXimage_c_set.nxdl.xml
#	contributed_definitions/NXimage_r_set.nxdl.xml
#	contributed_definitions/NXion.nxdl.xml
#	contributed_definitions/NXms_feature_set.nxdl.xml
#	contributed_definitions/NXoptical_system_em.nxdl.xml
#	contributed_definitions/NXpulser_apm.nxdl.xml
#	contributed_definitions/NXrotation_set.nxdl.xml
#	contributed_definitions/NXscanbox_em.nxdl.xml
#	contributed_definitions/NXsimilarity_grouping.nxdl.xml
#	contributed_definitions/NXspectrum_set.nxdl.xml
#	contributed_definitions/NXstage_lab.nxdl.xml
#	contributed_definitions/NXsubsampling_filter.nxdl.xml
  • Loading branch information
domna authored and lukaspie committed Dec 11, 2024
1 parent 2cb86dc commit 950437b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion contributed_definitions/NXcg_polygon_set.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ somewhat redundant as there is NXoff_geometry but easier to understand
<doc>
Integer used to distinguish polygons for explicit indexing.
</doc>
<dimensions>
<dimensions rank="1">
<dim index="1" value="c"/>
</dimensions>
</field>
Expand Down
4 changes: 2 additions & 2 deletions contributed_definitions/NXstage_lab.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
<!--
# NeXus - Neutron and X-ray Common Data Format
#
#
# Copyright (C) 2014-2024 NeXus International Advisory Committee (NIAC)
#
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
Expand Down
4 changes: 2 additions & 2 deletions contributed_definitions/NXsubsampling_filter.nxdl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl"?>
<!--
# NeXus - Neutron and X-ray Common Data Format
#
#
# Copyright (C) 2014-2024 NeXus International Advisory Committee (NIAC)
#
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Prepare for Documentation
lxml
pyyaml
nyaml
nyaml==0.0.8

# Documentation building
sphinx>=5
Expand Down

0 comments on commit 950437b

Please sign in to comment.