BLD: v0.4.0 separation of data and content

DPGAlliance · Apr 15, 2020 · e463aed · e463aed
1 parent 254e1e0
commit e463aed
Show file tree

Hide file tree

Showing 37 changed files with 55 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,23 +6,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.0] - 2020-04-15
+### Changed
+- Modified `nominee-schema.json` to split the `data` type into `data` and `content`. Re-classified all nominees originally tagged as data accordingly.
+- Added `H5P` and `WHO-app` as new nominees.
+- Switched CI from Travis to GitHub Actions.
+- Excluded nominees with `ND` licenses and moved them out from `nominees/` into `excluded-nd`.
+
 ## [0.3.0] - 2020-03-05
 ### Added
 - Added `scripts/migrate-v0.3.0.js` to automatically migrate to the new version of the JSON schema.
-- Imported more than 200 new nominees from [publicgoods/products](https://github.com/publicgoods/products)
+- Imported more than 200 new nominees from [publicgoods/products](https://github.com/publicgoods/products).
 - Added `scripts/check-filenames.bash` to automatically check the proper naming of nominees.
 - Added `scripts/order-fields.js` to automatically check the proper ordering of properties in each nominee file.
 
 ### Changed
-- Modified 'nominee-schema.json' to match the product-schema.json available at https://github.com/publicgoods/data-schema
+- Modified 'nominee-schema.json' to match the product-schema.json available at https://github.com/publicgoods/data-schema.
 
 ## [0.2.1] - 2020-10-15
 ### Added
-- Added 32 more nominees supported by UNICEF Venture Fund
+- Added 32 more nominees supported by UNICEF Venture Fund.
 - Added `scripts/csvToJson.js` to automatically parse a spreadsheet containing a list of nominees and their attributes and generate json files for each nominee.
 
 ### Changed
-- Modified 'nominee-schema.json' to add a new attribute 'supported_by', which is an array of objects initially containing one property 'org_name'
+- Modified `nominee-schema.json` to add a new attribute `supported_by`, which is an array of objects initially containing one property `org_name`.
 
 ## [0.2.0] - 2020-01-10
 ### Added
@@ -41,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed language from `candidates` to `nominees` to match the recent changes in [digitalpublicgoods.net](https://digitalpublicgoods.net)
 - Renamed folder from `candidates/` to `nominees/`, as well as `candidate-schema.json` to `nominee-schema.json`
 
+[0.4.0]: https://github.com/unicef/publicgoods-candidates/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/unicef/publicgoods-candidates/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/unicef/publicgoods-candidates/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/unicef/publicgoods-candidates/compare/v0.1.0...v0.2.0

diff --git a/excluded-nd/merlot.json b/excluded-nd/merlot.json
@@ -20,7 +20,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/excluded-nd/siyavula-open-textbooks.json b/excluded-nd/siyavula-open-textbooks.json
@@ -20,7 +20,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/excluded-nd/ted.json b/excluded-nd/ted.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominee-schema.json b/nominee-schema.json
@@ -551,6 +551,7 @@
         "enum": [
           "software",
           "data",
+          "content",
           "standard"
         ]
       }

diff --git a/nominees/african-storybook.json b/nominees/african-storybook.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/book-dash.json b/nominees/book-dash.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/british-columbia-open-textbook-collection.json b/nominees/british-columbia-open-textbook-collection.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/cireha.json b/nominees/cireha.json
@@ -21,7 +21,7 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "content"
   ],
   "repositoryURL": "https://github.com/cboard-org/cboard",
   "organizations": [

diff --git a/nominees/ck-12.json b/nominees/ck-12.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/curriki.json b/nominees/curriki.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/digital-literacy-library.json b/nominees/digital-literacy-library.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/fundza-novels.json b/nominees/fundza-novels.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/global-digital-library.json b/nominees/global-digital-library.json
@@ -24,7 +24,7 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "content"
   ],
   "repositoryURL": "https://github.com/GlobalDigitalLibraryio/book-api",
   "organizations": [

diff --git a/nominees/jhsph-opencourseware.json b/nominees/jhsph-opencourseware.json
@@ -20,7 +20,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/ka-lite.json b/nominees/ka-lite.json
@@ -20,7 +20,8 @@
   ],
   "sectors": [],
   "type": [
-    "software"
+    "software",
+    "content"
   ],
   "repositoryURL": "https://github.com/learningequality/ka-lite",
   "organizations": [

diff --git a/nominees/khan-academy.json b/nominees/khan-academy.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/mit-opencourseware.json b/nominees/mit-opencourseware.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/oer-africa.json b/nominees/oer-africa.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/oer-commons.json b/nominees/oer-commons.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/open-ag-data-alliance.json b/nominees/open-ag-data-alliance.json
@@ -29,7 +29,8 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "data",
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/open-demographics.json b/nominees/open-demographics.json
@@ -16,7 +16,8 @@
   ],
   "sectors": [],
   "type": [
-    "software"
+    "content",
+    "data"
   ],
   "repositoryURL": "https://github.com/drnikki/open-demographics",
   "organizations": [

diff --git a/nominees/open-stax.json b/nominees/open-stax.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/open-textbook-library.json b/nominees/open-textbook-library.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/open-up-resources.json b/nominees/open-up-resources.json
@@ -17,7 +17,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/openfarm.json b/nominees/openfarm.json
@@ -25,7 +25,8 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "data",
+    "content"
   ],
   "repositoryURL": "https://github.com/openfarmcc/OpenFarm",
   "organizations": [

diff --git a/nominees/openlearn.json b/nominees/openlearn.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/phet-interactive-simulations.json b/nominees/phet-interactive-simulations.json
@@ -28,7 +28,8 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "data",
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/practical-plants.json b/nominees/practical-plants.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/pubic-library-of-science.json → nominees/public-library-of-science.json b/nominees/pubic-library-of-science.json → nominees/public-library-of-science.json
@@ -1,9 +1,9 @@
 {
-  "name": "Pubic Library of Science",
+  "name": "Public Library of Science",
   "aliases": [
     "PLOS"
   ],
-  "description": "A library of open-access journal sand other scientific literature under an open-content license.",
+  "description": "A library of open-access journal and other scientific literature under an open-content license.",
   "website": "https://journals.plos.org/",
   "license": [
     {
@@ -19,7 +19,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/rah-e-maa.json b/nominees/rah-e-maa.json
@@ -1,6 +1,6 @@
 {
   "name": "Rah-e-maa",
-  "description": "A mobile app that mproves maternal health in Pakistan by engaging fathers",
+  "description": "A mobile app that improves maternal health in Pakistan by engaging fathers",
   "website": "https://www.superabbu.com",
   "license": [
     {

diff --git a/nominees/saylor-academy.json b/nominees/saylor-academy.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/skillscommons.json b/nominees/skillscommons.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/storyweaver.json b/nominees/storyweaver.json
@@ -16,7 +16,7 @@
   ],
   "sectors": [],
   "type": [
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/wikihow.json b/nominees/wikihow.json
@@ -21,7 +21,7 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/nominees/wikipedia.json b/nominees/wikipedia.json
@@ -17,7 +17,7 @@
   "sectors": [],
   "type": [
     "software",
-    "data"
+    "content"
   ],
   "organizations": [
     {

diff --git a/scripts/push.bash b/scripts/push.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 git clone https://github.com/unicef/publicgoods-website.git ../publicgoods-website
 git clone https://github.com/unicef/publicgoods-scripts.git ../publicgoods-scripts
-pushd ../publicgoods-scripts && ./static.bash && npm install && node index.js && popd
+pushd ../publicgoods-scripts && ./static.bash && npm install && node index.js && node generate_nominees.js && ./moveFiles.bash && popd
 git config --global user.email "[email protected]"
 git config --global user.name "Victor Grau Serrat"
 pushd ../publicgoods-website