Update fairmat branch with upstream main

.github/workflows/validate.yaml

@@ -36,4 +36,4 @@ jobs:
 
       - name: validate
         run: |
-          python -m dev_tools nxtest
+          python -m dev_tools nxtest

.gitignore

@@ -9,6 +9,7 @@ __pycache__/
 # Build artifacts
 build/
 makelog.txt
+# nyaml/
 
 # Distribution / packaging
 .Python
@@ -30,4 +31,10 @@ share/python-wheels/
 *.egg
 MANIFEST
 
-*_parsed.yaml
+*_parsed.yaml
+# Unknown
+/python/
+__github_creds__.txt
+
+# used locally to validate nxdl.xsd and nxdlTypes.xsd
+XMLSchema.xsd

CHANGES.rst

@@ -21,11 +21,41 @@ Highlights of each release are described below.  For more details, see our wiki
 (https://github.com/nexusformat/definitions/wiki/Release-Notes)
 which provides links to the Release Notes (itemized list of changes) for any release.
 
+.. incoming change for next release
 
-v2023.06
+  v2025.mm
+  ++++++++
+
+  for release sometime in *2025*
+
+  Maintenance
+  -----------
+
+  * Add nameType="partial" to NXDL schema.
+  * Use 'nameType' attribute in fields, groups, and attributes.
+
+v2024.02
 ++++++++
 
-expected *2023-06*
+released *2024-02-09*
+
+This release is the result of a NIAC meeting in 2022-09,
+NeXus Code Camps in 2022-06 and 2023-06,
+and substantial work by the NeXus Community, the FAIRmat consortium and NIAC members.
+
+Summary statistics from the GitHub definitions repository show
+this activity since the (previous) v2022.07 release:
+
+=============   ========
+activity        quantity
+=============   ========
+Pull Requests   67
+Issues          34
+Commits         413
+=============   ========
+
+See the wiki for more details:
+https://github.com/nexusformat/definitions/wiki/releasenotes__v2024.02
 
 New Features
 ------------
@@ -37,31 +67,68 @@ recommendation that this attribute be specified.
 
 NXxas: Added `NXdata/mode` to report detection method.
 
+Add various flux fields to NXbeam.
+
+Add virtual pixel handling to NXdetector.
+
+Add h5py example scripts.
+
+Add equipment_component attribute to NXtransformations.
+
+Add countrate_correction_lookup_table to NXdetector for NXmx.
+
+Allow axis fields to be numbers or strings and add a default_slice attribute to NXdata.
+
+Add new NXdetector_channel base class.
+
+Add favicon to manual web pages.
+
+Add many new contributed definitions from FAIRmat.
+
+Allow NeXus definitions to be created with YAML.
+
+Add recent contributors links to NeXus classes html pages.
+
+Improve link navigation in application definition items and collapse doc strings.
+
+
 Fixes
 -----------
 
-Added missing close parenthesis in rendering of suggested target.
+Add missing close parenthesis in rendering of suggested target.
+
+Amend text that mistakenly deprecated NXaperture.
+
+Generalize NXsource type for electron sources.
 
 Maintenance
 -----------
 
-NXdata: clarify how errors are described in documentation.
+NXdata: clarify how errors are described in documentation; remove obsolete dimension
+index attribute; clarify that attributes that name other fields must be existing
+children of group; improve documentation on axes.
 
-NXmx: clarify pixel size.
+NXmx: clarify pixel size, update NXbeam documentation on incident_wavelength_spectrum,
+make countrate_correction_lookup_table optional
 
-NXsas: Various fields and groups changed to optional.  Only those deemed
+NXsas: Various fields and groups changed to optional. Only those deemed
 necessary for data reduction are required.
 
-NXtransformations: Add ``equipment_component`` attribute
+NXtransformations: Add ``equipment_component`` attribute.
 
 NXxas: `data` fields` changed from `NX_INT` to `NX_NUMBER`.
 
-NXxpcs: clarify use of ``entry_identifier``, ``entry_identifier_uuid``, and ``scan_number``.
+NXxpcs: clarify use of ``entry_identifier``, ``entry_identifier_uuid``, and ``scan_number``;
+fix some units.
+
+Clarify how NXbeam can be in NXinstrument groups or NXsample.
+
+
 
 Deprecations
 ------------
 
-NXdata: deprecate `errors` field in favor of `VARIABLE_errors` for the signal field.
+NXdata: deprecate `errors` field in favor of `FIELDNAME_errors` for the signal field.
 
 ..
   Contributors

Makefile

@@ -117,7 +117,7 @@ nyaml:
 
 # NeXus - Neutron and X-ray Common Data Format
 #
-# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-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

NXDL_VERSION

@@ -1 +1 @@
-v2022.07
+v2024.02

applications/NXarchive.nxdl.xml

@@ -3,7 +3,7 @@
 <!--
 # NeXus - Neutron and X-ray Common Data Format
 # 
-# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
+# Copyright (C) 2008-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
@@ -37,7 +37,7 @@
 	        a mechanism to link all aspects of ISIS research from 
 	        proposal through to publication. 
     </doc>
-    <group type="NXentry" name="entry">
+    <group type="NXentry">
       <attribute name="index"></attribute>
       <field name="title" />
       <field name="experiment_identifier" type="NX_CHAR">