Skip to content

Bulk updates from G Madariaga #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Nov 7, 2025
Merged

Bulk updates from G Madariaga #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
40e1fea
Bulk update from G. Madariaga.
Oct 20, 2025
187dbcf
Remove unknown dictionaries from import.
Oct 20, 2025
7222b3a
Allow duplicate definitions on import.
Oct 20, 2025
e713c3b
Removed all but one import as syntax check failed
Oct 20, 2025
3e021e0
Automated fixes for dates and types
Oct 20, 2025
5890dd5
Removed incorrectly added 'Derived' values.
Oct 22, 2025
06204f2
Add missing _units.code and enumerations to match linked names.
Oct 28, 2025
0994215
Change CIF master files repository to jamesrhester
jamesrhester Oct 28, 2025
84147a2
Fix checkout of local versions
jamesrhester Oct 29, 2025
a4c543c
Fix capitalisation of None in _units.code (should be lowercase)
Oct 29, 2025
6c894cf
Add missing SU datanames.
Oct 29, 2025
947a27b
More consistency fixes
Oct 29, 2025
250b800
Fixed dates, changed purpose of previous 'Link' items.
Oct 29, 2025
1120596
Use local version of action for testing
jamesrhester Oct 29, 2025
d18ee2f
Add dependent dictionaries to checkout
jamesrhester Oct 31, 2025
505e715
Change branch reference from 'master' to 'main'
jamesrhester Oct 31, 2025
ac5aae8
Change base dictionary to multiblock.
Oct 31, 2025
ceeb062
Adjusted for multi-block dictionary
Oct 31, 2025
7d24c3d
Adjusted cell and atom_site_aniso categories for multiblock
Oct 31, 2025
7dba6fa
Fix stray semicolon
Oct 31, 2025
3ce55e0
Add twinning dictionary to imports
Oct 31, 2025
f82fb4d
Change order of imports
Nov 5, 2025
48e21a5
Formatting fixes.
Nov 5, 2025
8bc2b94
Revert to official ddlm checker
jamesrhester Nov 6, 2025
538b072
Revert checking to use central core CIF
jamesrhester Nov 6, 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
21 changes: 20 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,26 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4

# Checkout local version of master files to enable parallel updating.
# Remove this after testing
- name: Checkout CIF master files
uses: actions/checkout@v4
with:
repository: COMCIFS/cif_core
ref: master
path: cif-dictionaries/cif_core
- name: Checkout multiblock files
uses: actions/checkout@v4
with:
repository: COMCIFS/MultiBlock_Dictionary
ref: main
path: cif-dictionaries/multiblock
- name: Checkout Twinning dictionary
uses: actions/checkout@v4
with:
repository: COMCIFS/Twinning_Dictionary
ref: main
path: cif-dictionaries/twinning
- name: check_ddlm
uses: COMCIFS/dictionary_check_action@main
id: ddlm_check
Expand Down
Loading