remove fairmat-specific files

.github/workflows/ci.yaml

@@ -3,12 +3,10 @@ name: CI
 on:
   push:
     branches:
-      - main
-      - fairmat   # push commit to the fairmat branch
+      - main   # push commit to the main branch
   pull_request:
     branches:
-      - main
-      - fairmat   # pull request to the fairmat branch
+      - main   # pull request to the main branch
   workflow_dispatch:   # allow manual triggering
     inputs:
       deploy:
@@ -32,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
       max-parallel: 5
     env:
       python_version: ${{ matrix.python-version }}

.gitignore

@@ -13,6 +13,4 @@ nyaml/
 
 # Unknown
 /python/
-__github_creds__.txt
-MANIFEST
-*_parsed.yaml
+__github_creds__.txt

Makefile

@@ -28,7 +28,6 @@ help ::
 	@echo "make autoformat         Format all files to the coding style conventions."
 	@echo "make test               Run NXDL syntax and documentation tests."
 	@echo "make clean              Remove all build files."
-	@echo "make clean-nyaml        Remove all nyaml files."
 	@echo "make prepare            (Re)create all build files."
 	@echo "make html               Build HTML version of manual. Requires prepare first."
 	@echo "make pdf                Build PDF version of manual. Requires prepare first."
@@ -61,8 +60,6 @@ test ::
 
 clean ::
 	$(RM) -rf $(BUILD_DIR)
-
-clean-nyaml ::
 	$(RM) -rf $(BASE_CLASS_DIR)/$(NYAML_SUBDIR)
 	$(RM) -rf $(APPDEF_DIR)/$(NYAML_SUBDIR)
 	$(RM) -rf $(CONTRIB_DIR)/$(NYAML_SUBDIR)
@@ -73,7 +70,7 @@ prepare ::
 
 pdf ::
 	$(SPHINX) -M latexpdf $(BUILD_DIR)/manual/source/ $(BUILD_DIR)/manual/build
-	cp $(BUILD_DIR)/manual/build/latex/nexus-fairmat.pdf $(BUILD_DIR)/manual/source/_static/NeXusManual.pdf
+	cp $(BUILD_DIR)/manual/build/latex/nexus.pdf $(BUILD_DIR)/manual/source/_static/NeXusManual.pdf
 
 html ::
 	$(SPHINX) -b html -W $(BUILD_DIR)/manual/source/ $(BUILD_DIR)/manual/build/html
@@ -98,7 +95,7 @@ all ::
 	@echo "HTML built: `ls -lAFgh $(BUILD_DIR)/impatient-guide/build/html/index.html`"
 	@echo "PDF built: `ls -lAFgh $(BUILD_DIR)/impatient-guide/build/latex/NXImpatient.pdf`"
 	@echo "HTML built: `ls -lAFgh $(BUILD_DIR)/manual/build/html/index.html`"
-	@echo "PDF built: `ls -lAFgh $(BUILD_DIR)/manual/build/latex/nexus-fairmat.pdf`"
+	@echo "PDF built: `ls -lAFgh $(BUILD_DIR)/manual/build/latex/nexus.pdf`"
 
 $(BASE_CLASS_DIR)/%.nxdl.xml : $(BASE_CLASS_DIR)/$(NYAML_SUBDIR)/%.yaml
 	nyaml2nxdl $< --output-file $@
@@ -117,7 +114,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
@@ -133,4 +130,4 @@ nyaml:
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# For further information, see http://www.nexusformat.org
+# For further information, see http://www.nexusformat.org

README.md

@@ -25,17 +25,6 @@ Open the HTML manual in a web brower for visual verification
 
     firefox build/manual/build/html/index.html
 
-Convenient editing of definitions is available in nyaml format. For this, definitions need to be converted first from xml to yaml format by the command
-
-    make nyaml
-
-After editing the definitions in nyaml format in the nyaml subdirectories, the following command can be used to update the definitions in nxdl.xml format:
-
-    make nxdl
-
-> [!WARNING]  
-> Please be aware that your nyaml files might be out of sync with the nxdl files when you update your repo. So it's best practice to stash your changes to the nyaml files and regenerate the files with `make nyaml` before adding any changes.
-
 ### HTML pages with contributor information
 
 To build the html pages that contains contributor information on the sidebar set a github access token to an environment variable called GH_TOKEN.
@@ -86,4 +75,4 @@ package/                       | directory for packaging this content
 utils/                         | various tools used in the definitions tree
 www/                           | launch (home) page of NeXus WWW site
 xslt/                          | various XML stylesheet transformations
-dev_tools/                     | developer tools for testing and building
+dev_tools/                     | developer tools for testing and building

dev_tools/globals/urls.py

@@ -1,2 +1,2 @@
-REPO_URL = "https://github.com/FAIRmat-NFDI/nexus_definitions/tree/fairmat"
+REPO_URL = "https://github.com/nexusformat/definitions/blob/main"
 MANUAL_URL = "https://manual.nexusformat.org"