Skip to content

change http back to https to make mlcroissant validate happy #12333

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
stevenwinship merged 1 commit into from
Apr 16, 2026
Merged

change http back to https to make mlcroissant validate happy #12333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/api/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This API changelog is experimental and we would love feedback on its usefulness.
v6.11
-----

- The Croissant :ref:`metadata export format <metadata-export-formats>` has been updated from version 1.0 to 1.1, which is reflected in the ``conformsTo`` property. ``@vocab`` and ``sc`` properties now use "http" as `recommended <https://github.com/mlcommons/croissant/pull/929#pullrequestreview-3079137662>`_. The unused ``wd`` property has been dropped.
- The Croissant :ref:`metadata export format <metadata-export-formats>` has been updated from version 1.0 to 1.1, which is reflected in the ``conformsTo`` property. The unused ``wd`` property has been dropped.

v6.10
-----
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/export/croissant/CroissantExportUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Map;
import org.apache.commons.text.StringEscapeUtils;

// Validate with src/test/resources/croissant/validate.sh
public class CroissantExportUtil {

public static void exportDataset(
Expand All @@ -31,7 +32,7 @@ public static void exportDataset(
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -70,7 +71,7 @@ public static void exportDataset(
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/croissant/cars/expected/cars-croissant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down Expand Up @@ -800,4 +800,4 @@
]
}
]
}
}
4 changes: 2 additions & 2 deletions src/test/resources/croissant/cars/expected/cars-croissantSlim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/croissant/draft/expected/draft-croissant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down Expand Up @@ -91,4 +91,4 @@
"contentUrl": "http://localhost:8080/api/access/datafile/4"
}
]
}
}
4 changes: 2 additions & 2 deletions src/test/resources/croissant/draft/expected/draft-croissantSlim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/croissant/junk/expected/junk-croissant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down Expand Up @@ -80,4 +80,4 @@
},
"version": "1.0",
"citeAs": "@data{FK2/0CNXUJ_2025,author = {Ritter, Sylvester},publisher = {Root},title = {},year = {2025},url = {https://doi.org/10.5072/FK2/0CNXUJ}}"
}
}
4 changes: 2 additions & 2 deletions src/test/resources/croissant/max/expected/max-croissant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/croissant/max/expected/max-croissantSlim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/croissant/minimal/expected/minimal-croissant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/croissant/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mlcroissant==1.0.22
6 changes: 3 additions & 3 deletions src/test/resources/croissant/restricted/expected/restricted-croissant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down Expand Up @@ -112,4 +112,4 @@
"contentUrl": "http://localhost:8080/api/access/datafile/8"
}
]
}
}
4 changes: 2 additions & 2 deletions src/test/resources/croissant/restricted/expected/restricted-croissantSlim.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"@context": {
"@language": "en",
"@vocab": "http://schema.org/",
"@vocab": "https://schema.org/",
"citeAs": "cr:citeAs",
"column": "cr:column",
"conformsTo": "dct:conformsTo",
Expand Down Expand Up @@ -40,7 +40,7 @@
"repeated": "cr:repeated",
"replace": "cr:replace",
"samplingRate": "cr:samplingRate",
"sc": "http://schema.org/",
"sc": "https://schema.org/",
"separator": "cr:separator",
"source": "cr:source",
"subField": "cr:subField",
Expand Down
10 changes: 10 additions & 0 deletions src/test/resources/croissant/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
# Check datasets with this tool as well: https://huggingface.co/spaces/JoaquinVanschoren/croissant-checker
#
# Following warnings are expected for drafts.
# - [Metadata(Draft Dataset)] Property "https://schema.org/datePublished" is recommended, but does not exist.
# - [Metadata(Draft Dataset)] WarningException("Version doesn't follow MAJOR.MINOR.PATCH: DRAFT. For more information refer to: https://semver.org/spec/v2.0.0.html")
for i in */expected/*.json; do
echo testing $i
mlcroissant validate --jsonld $i
done
Copy link
Copy Markdown
Member Author

@pdurbin pdurbin Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just putting this at the bottom of the PR... https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-12333/1/consoleFull shows a failure to deploy the EC2 instance so I kicked off another run: https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-12333/2/

Copy link
Copy Markdown
Member Author

@pdurbin pdurbin Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh good, tests are passing now: https://jenkins.dataverse.org/job/IQSS-Dataverse-Develop-PR/job/PR-12333/2/testReport/

Loading
⚡