Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
008f66e
update dap4.xsd to coincide with published schema
Mikejmnez Nov 7, 2025
6027096
remove BlobType complexType
Mikejmnez Nov 10, 2025
fe5d3eb
remove purl`s dc schema only used by BlobType
Mikejmnez Nov 10, 2025
31538d2
update dap4 schema using that from 3.3 published source as starting p…
Mikejmnez Nov 19, 2025
c878029
change to DatasetType
Mikejmnez Nov 20, 2025
4010fe7
update schema that validates
Mikejmnez Nov 21, 2025
e919262
add simple test dmr file to setup initial validation test
Mikejmnez Nov 21, 2025
52354b7
set up test workflows
Mikejmnez Nov 21, 2025
de6bf9a
add pre-commit for syntax on dap4 schema, and tests files
Mikejmnez Nov 21, 2025
136d827
run on master branch
Mikejmnez Nov 21, 2025
6052e6d
enable min occurange=0 for Groups
Mikejmnez Nov 21, 2025
7a175d1
rename test dmr, describe test in name
Mikejmnez Nov 21, 2025
57b8572
attribute test dmr
Mikejmnez Nov 22, 2025
9b6e41a
add more tests - fix schema
Mikejmnez Nov 22, 2025
684d4d6
more tests
Mikejmnez Nov 22, 2025
148312e
more tests
Mikejmnez Nov 22, 2025
3ce4bd9
add test dmr with an xml element as a value to an attribute
Mikejmnez Nov 22, 2025
dfd7f33
set up more tests, including failing ones with Structures
Mikejmnez Nov 22, 2025
bd8a0e9
enable Dim elements wth optional name, size attributes
Mikejmnez Nov 24, 2025
69c9af5
nested struct no dims
Mikejmnez Nov 24, 2025
3b9b06c
enable testing specific dap4 schema declarations in python
Mikejmnez Nov 24, 2025
fbda1a6
remove fixture - set tests per invalide case
Mikejmnez Nov 24, 2025
d0a150f
dataset declaration dmr
Mikejmnez Nov 24, 2025
c30faf2
enable enumeration types validation
Mikejmnez Nov 25, 2025
0ac50b7
test all possible value a BaseType may take
Mikejmnez Nov 25, 2025
9fb7d2b
test for all value types in Attributes definitions
Mikejmnez Nov 25, 2025
a659d9c
update spec to reflect used elements
Mikejmnez Nov 26, 2025
3c27b6e
rename DimRefType to DimType
Mikejmnez Nov 26, 2025
a12383e
slim down MapType to only define name as an attribute. Nothing else
Mikejmnez Nov 26, 2025
0fa762c
add comment about MapType
Mikejmnez Nov 26, 2025
154ecb9
remove unused ArrayDimension
Mikejmnez Nov 26, 2025
a43fa93
add OtherXML to be possible to be defined within an Attribute
Mikejmnez Nov 26, 2025
171cf8d
add comment atop element declaration
Mikejmnez Nov 26, 2025
74c9501
last comments
Mikejmnez Nov 26, 2025
0c45311
define a self-contained OpaqueType and test
Mikejmnez Nov 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Validate DAP4 XML

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
validate-dmr:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.12'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install lxml pytest

- name: Run DMR XML validation
run: |
pytest -v
51 changes: 51 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
*.py[cod]

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64

# Installer logs
pip-log.txt

# ignore shell script at base level
*.sh

# Unit test / coverage reports
.coverage
.tox
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
.project
.pydevproject

# Vim
*.swp

.cache
__pycache__
tests/__pycache__

# OS-X Finder
*.DS_Store

# IDEA Projects
.idea
29 changes: 29 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
repos:
- repo: https://github.com/psf/black
rev: 23.12.1
hooks:
- id: black
files: ^tests/.*\.py$

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.2
hooks:
- id: ruff
args: ["--fix"]
files: ^tests/.*\.py$

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: check-xml
files: |
^dap4/dap4\.xsd$
^tests/data/.*\.dmr$
- id: trailing-whitespace
files: |
^dap4/.*$
^tests/.*$
- id: end-of-file-fixer
files: |
^dap4/.*$
^tests/.*$
Loading