From 15f29a7dadce73b76a08fc8d86d742327b1a22f9 Mon Sep 17 00:00:00 2001 From: sirine rekik Date: Thu, 19 Jan 2023 11:00:23 +0100 Subject: [PATCH 1/6] add custom license for France to the Dataverse Doc --- doc/sphinx-guides/source/installation/config.rst | 3 +++ scripts/api/data/licenses/license_etalab-2.0.json | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 scripts/api/data/licenses/license_etalab-2.0.json diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 9b570e59e52..01393d9c4c4 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -1082,6 +1082,9 @@ Adding Custom Licenses If you are interested in adding a custom license, you will need to create your own JSON file as explained in see :ref:`standardizing-custom-licenses`. +Other licenses used worldwide: +- :download:`license_etalab-2.0.json <../../../../scripts/api/data/licenses/license_etalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). + Removing Licenses +++++++++++++++++ diff --git a/scripts/api/data/licenses/license_etalab-2.0.json b/scripts/api/data/licenses/license_etalab-2.0.json new file mode 100644 index 00000000000..e88709124c1 --- /dev/null +++ b/scripts/api/data/licenses/license_etalab-2.0.json @@ -0,0 +1,7 @@ +{ + "name": "etalab 2.0", + "uri": "https://spdx.org/licenses/etalab-2.0.html", + "shortDescription": "Etalab Open License 2.0", + "iconUrl": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/Logo-licence-ouverte2.svg/25px-Logo-licence-ouverte2.svg.png", + "active": true +} From c8a59666c9fcabd4f8390b58ebc7d76d4c75a40b Mon Sep 17 00:00:00 2001 From: sirine rekik Date: Thu, 19 Jan 2023 11:44:39 +0100 Subject: [PATCH 2/6] add a line break --- doc/sphinx-guides/source/installation/config.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 01393d9c4c4..b72bd891ae8 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -1083,6 +1083,7 @@ Adding Custom Licenses If you are interested in adding a custom license, you will need to create your own JSON file as explained in see :ref:`standardizing-custom-licenses`. Other licenses used worldwide: + - :download:`license_etalab-2.0.json <../../../../scripts/api/data/licenses/license_etalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). Removing Licenses From 858f865ebffa67383b38873400bf149756acb123 Mon Sep 17 00:00:00 2001 From: sirineREKIK Date: Thu, 9 Feb 2023 15:55:34 +0100 Subject: [PATCH 3/6] delete license file and update path in doc file to consider PR 9262 --- doc/sphinx-guides/source/installation/config.rst | 2 +- scripts/api/data/licenses/license_etalab-2.0.json | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 scripts/api/data/licenses/license_etalab-2.0.json diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index b72bd891ae8..1871faba050 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -1084,7 +1084,7 @@ If you are interested in adding a custom license, you will need to create your o Other licenses used worldwide: -- :download:`license_etalab-2.0.json <../../../../scripts/api/data/licenses/license_etalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). +- :download:`license_etalab-2.0.json <../../../../scripts/api/data/licenses/licenseetalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). Removing Licenses +++++++++++++++++ diff --git a/scripts/api/data/licenses/license_etalab-2.0.json b/scripts/api/data/licenses/license_etalab-2.0.json deleted file mode 100644 index e88709124c1..00000000000 --- a/scripts/api/data/licenses/license_etalab-2.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "etalab 2.0", - "uri": "https://spdx.org/licenses/etalab-2.0.html", - "shortDescription": "Etalab Open License 2.0", - "iconUrl": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/Logo-licence-ouverte2.svg/25px-Logo-licence-ouverte2.svg.png", - "active": true -} From 46a1b3edfcb930e2a71fd079d596fb812d5afe5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20ROUCOU?= Date: Tue, 11 Feb 2025 16:35:02 +0100 Subject: [PATCH 4/6] Add licenseEtalab-2.0.json file --- doc/release-notes/9302-add-Etalab-License.md | 5 +++++ doc/sphinx-guides/source/installation/config.rst | 2 +- scripts/api/data/licenses/licenseEtalab-2.0.json | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/9302-add-Etalab-License.md create mode 100644 scripts/api/data/licenses/licenseEtalab-2.0.json diff --git a/doc/release-notes/9302-add-Etalab-License.md b/doc/release-notes/9302-add-Etalab-License.md new file mode 100644 index 00000000000..9ad10dd992f --- /dev/null +++ b/doc/release-notes/9302-add-Etalab-License.md @@ -0,0 +1,5 @@ +A new file has been added to import the French Open License to Dataverse: licenseEtalab-2.0.json. + +This license, which is compatible with the Creative Commons license, is recommended by the French government for open documents. + +For more information, see pull request [#9302](https://github.com/IQSS/dataverse/pull/9302) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index e967cc15137..bfc2372a548 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -2058,7 +2058,7 @@ If you are interested in adding a custom license, you will need to create your o Other licenses used worldwide: -- :download:`license_etalab-2.0.json <../../../../scripts/api/data/licenses/licenseetalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). +- :download:`licenseEtalab-2.0.json <../../../../scripts/api/data/licenses/licenseEtalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). Removing Licenses +++++++++++++++++ diff --git a/scripts/api/data/licenses/licenseEtalab-2.0.json b/scripts/api/data/licenses/licenseEtalab-2.0.json new file mode 100644 index 00000000000..811029890d8 --- /dev/null +++ b/scripts/api/data/licenses/licenseEtalab-2.0.json @@ -0,0 +1,8 @@ +{ + "name": "etalab 2.0", + "uri": "https://spdx.org/licenses/etalab-2.0.html", + "shortDescription": "Etalab Open License 2.0, compatible CC-BY 2.0", + "iconUrl": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/Logo-licence-ouverte2.svg/25px-Logo-licence-ouverte2.svg.png", + "active": true, + "sortOrder": 10 +} From 57785188204cecbc4a1d2bb07526e9f8eb452c34 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Wed, 26 Feb 2025 16:37:27 -0500 Subject: [PATCH 5/6] move Etalab license to new "country-specific" section #9301 --- doc/sphinx-guides/source/installation/config.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index bfc2372a548..50989974119 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -2034,6 +2034,11 @@ JSON files for software licenses are provided below. - :download:`licenseMIT.json <../../../../scripts/api/data/licenses/licenseMIT.json>` - :download:`licenseApache-2.0.json <../../../../scripts/api/data/licenses/licenseApache-2.0.json>` +Adding Country-Specific Licenses +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- :download:`licenseEtalab-2.0.json <../../../../scripts/api/data/licenses/licenseEtalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). + Contributing to the Collection of Standard Licenses Above ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -2056,10 +2061,6 @@ Adding Custom Licenses If you are interested in adding a custom license, you will need to create your own JSON file as explained in see :ref:`standardizing-custom-licenses`. -Other licenses used worldwide: - -- :download:`licenseEtalab-2.0.json <../../../../scripts/api/data/licenses/licenseEtalab-2.0.json>` used in France (Etalab Open License 2.0, CC-BY 2.0 compliant). - Removing Licenses +++++++++++++++++ From 941f4f636a5b1400e766dd3f3d30eb47538d9ea6 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Wed, 26 Feb 2025 16:40:18 -0500 Subject: [PATCH 6/6] tweak release note #9301 --- doc/release-notes/9302-add-Etalab-License.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/9302-add-Etalab-License.md b/doc/release-notes/9302-add-Etalab-License.md index 9ad10dd992f..8eed5eff04f 100644 --- a/doc/release-notes/9302-add-Etalab-License.md +++ b/doc/release-notes/9302-add-Etalab-License.md @@ -1,5 +1,5 @@ -A new file has been added to import the French Open License to Dataverse: licenseEtalab-2.0.json. +A new file has been added to import the French Open License to Dataverse: licenseEtalab-2.0.json. You can download it from [the guides](https://dataverse-guide--9302.org.readthedocs.build/en/9302/installation/config.html#adding-licenses). This license, which is compatible with the Creative Commons license, is recommended by the French government for open documents. -For more information, see pull request [#9302](https://github.com/IQSS/dataverse/pull/9302) +For more information, see #9301 and #9302.