Skip to content

Commit 9d8bb25

Browse files
mreteganmretegan
authored
Merge branch 'nexusformat:main' into main
2 parents 17850c6 + 5b6daa0 commit 9d8bb25

282 files changed

Lines changed: 1205 additions & 613 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Documentation build
22

33
on:
44
push:
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
strategy:
3232
matrix:
33-
python-version: ['3.8', '3.9', '3.10', '3.11']
33+
python-version: ['3.12']
3434
max-parallel: 5
3535
env:
3636
python_version: ${{ matrix.python-version }}

‎.github/workflows/validate.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Validate Definitions
2+
3+
on:
4+
push:
5+
branches:
6+
- "*" # push commit to the main branch
7+
pull_request:
8+
branches:
9+
- "*" # pull request to the main branch
10+
11+
12+
defaults:
13+
run:
14+
shell: bash
15+
16+
jobs:
17+
build-linux:
18+
name: CI py${{ matrix.python-version }}
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- name: Checkout Repository
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
27+
- name: Set up Python
28+
uses: actions/setup-python@v4
29+
with:
30+
python-version: "3.12"
31+
32+
- name: Install Requirements
33+
run: |
34+
python -m pip install --upgrade pip setuptools
35+
python -m pip install -r requirements.txt
36+
37+
- name: validate
38+
run: |
39+
python -m dev_tools nxtest

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ nyaml/
1313

1414
# Unknown
1515
/python/
16-
__github_creds__.txt
16+
__github_creds__.txt
17+
18+
# used locally to validate nxdl.xsd and nxdlTypes.xsd
19+
XMLSchema.xsd

‎CHANGES.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ Highlights of each release are described below. For more details, see our wiki
2121
(https://github.com/nexusformat/definitions/wiki/Release-Notes)
2222
which provides links to the Release Notes (itemized list of changes) for any release.
2323

24+
.. incoming change for next release
25+
26+
v2025.mm
27+
++++++++
28+
29+
for release sometime in *2025*
30+
31+
Maintenance
32+
-----------
33+
34+
* Add nameType="partial" to NXDL schema.
35+
* Use 'nameType' attribute in fields, groups, and attributes.
2436
2537
v2024.02
2638
++++++++

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ nyaml:
114114

115115
# NeXus - Neutron and X-ray Common Data Format
116116
#
117-
# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
117+
# Copyright (C) 2008-2024 NeXus International Advisory Committee (NIAC)
118118
#
119119
# This library is free software; you can redistribute it and/or
120120
# modify it under the terms of the GNU Lesser General Public

‎applications/NXarchive.nxdl.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
# NeXus - Neutron and X-ray Common Data Format
55
#
6-
# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
6+
# Copyright (C) 2008-2024 NeXus International Advisory Committee (NIAC)
77
#
88
# This library is free software; you can redistribute it and/or
99
# modify it under the terms of the GNU Lesser General Public

‎applications/NXarpes.nxdl.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
# NeXus - Neutron and X-ray Common Data Format
55
#
6-
# Copyright (C) 2012-2022 NeXus International Advisory Committee (NIAC)
6+
# Copyright (C) 2012-2024 NeXus International Advisory Committee (NIAC)
77
#
88
# This library is free software; you can redistribute it and/or
99
# modify it under the terms of the GNU Lesser General Public

‎applications/NXcanSAS.nxdl.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
# NeXus - Neutron and X-ray Common Data Format
55
#
6-
# Copyright (C) 2012-2022 NeXus International Advisory Committee (NIAC)
6+
# Copyright (C) 2012-2024 NeXus International Advisory Committee (NIAC)
77
#
88
# This library is free software; you can redistribute it and/or
99
# modify it under the terms of the GNU Lesser General Public
@@ -278,7 +278,7 @@
278278
</doc>
279279
</attribute>
280280

281-
<field name="Q" type="NX_NUMBER" units="NX_PER_LENGTH">
281+
<field name="Q" type="NX_NUMBER" units="NX_PER_LENGTH" nameType="specified">
282282
<!-- http://www.cansas.org/formats/canSAS2012/1.0/doc/basics.html#definition-of -->
283283
<doc>
284284
.. index:: NXcanSAS (applications); Q
@@ -425,7 +425,7 @@
425425
</doc>
426426
</attribute>
427427
</field>
428-
<field name="I" type="NX_NUMBER">
428+
<field name="I" type="NX_NUMBER" nameType="specified">
429429
<!-- http://www.cansas.org/formats/canSAS2012/1.0/doc/basics.html#definition-of-intensity -->
430430
<doc>
431431
.. index:: NXcanSAS (applications); I
@@ -1187,7 +1187,7 @@
11871187
============================
11881188
-->
11891189

1190-
<group name="TRANSMISSION_SPECTRUM" type="NXdata" minOccurs="0">
1190+
<group name="TRANSMISSION_SPECTRUM" type="NXdata" minOccurs="0" nameType="any">
11911191
<doc>
11921192
The *SAStransmission_spectrum* element
11931193

‎applications/NXdirecttof.nxdl.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
# NeXus - Neutron and X-ray Common Data Format
55
#
6-
# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
6+
# Copyright (C) 2008-2024 NeXus International Advisory Committee (NIAC)
77
#
88
# This library is free software; you can redistribute it and/or
99
# modify it under the terms of the GNU Lesser General Public

‎applications/NXfluo.nxdl.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
# NeXus - Neutron and X-ray Common Data Format
55
#
6-
# Copyright (C) 2008-2022 NeXus International Advisory Committee (NIAC)
6+
# Copyright (C) 2008-2024 NeXus International Advisory Committee (NIAC)
77
#
88
# This library is free software; you can redistribute it and/or
99
# modify it under the terms of the GNU Lesser General Public

0 commit comments

Comments
 (0)