Merge pull request #100 from okfn/fix-port-deploy

bin/deploy.py

@@ -62,10 +62,10 @@ def create_licenses_csv_file(self):
         field_names = ['id', 'domain_content', 'domain_data', 'domain_software', 'family', 'is_generic', 'maintainer',
                        'od_conformance', 'osd_conformance', 'status', 'title', 'url', 'legacy_ids']
         filename = 'licenses.csv'
-        with open(filename, 'wb') as csv_file:
+        with open(filename, 'w') as csv_file:
             csv_writer = csv.DictWriter(csv_file, field_names, lineterminator='\n')
             csv_writer.writeheader()
-            csv_writer.writerows(sorted(licenses.values()))
+            csv_writer.writerows(sorted(licenses.values(), key=lambda x: x['id']))
         print('Updating csv file: DONE')
 
     def write_group_files(self):
@@ -127,12 +127,12 @@ def get_licenses(self):
 
 Create license groups and JSONP versions."""
     if len(sys.argv) < 2:
-        print usage
+        print(usage)
         sys.exit(1)
     action = sys.argv[1]
     if action == 'run':
         DeployCommand().run()
     elif action == 'clean':
         DeployCommand().clean()
     else:
-        print usage
+        print(usage)

licenses/C-BY-NC-ND-4.0.json → licenses/CC-BY-NC-ND-4.0.json

@@ -3,11 +3,11 @@
   "domain_data": true, 
   "domain_software": false, 
   "family": "", 
-  "id": "C-BY-NC-ND-4.0", 
+  "id": "CC-BY-NC-ND-4.0", 
   "od_conformance": "rejected", 
   "osd_conformance": "not reviewed", 
   "maintainer": "Creative Commons", 
   "status": "active", 
-  "title": "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)", 
+  "title": "Attribution-NonCommercial-NoDerivatives 4.0",
   "url": "https://creativecommons.org/licenses/by-nc-nd/4.0/"
 }

licenses/CC-BY-NC-SA-4.0.json

@@ -3,11 +3,11 @@
   "domain_data": true, 
   "domain_software": false, 
   "family": "", 
-  "id": "CC BY-NC-SA 4.0", 
+  "id": "CC-BY-NC-SA-4.0", 
   "od_conformance": "rejected", 
   "osd_conformance": "not reviewed", 
   "maintainer": "Creative Commons", 
   "status": "active", 
-  "title": "Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0) ", 
+  "title": "Attribution-NonCommercial-ShareAlike 4.0",
   "url": "https://creativecommons.org/licenses/by-nc-sa/4.0/"
 }

licenses/CC-BY-ND-4.0.json

@@ -4,10 +4,10 @@
   "domain_software": false, 
   "family": "", 
   "id": "CC-BY-ND-4.0", 
-  "od_conformance": "approved", 
+  "od_conformance": "rejected",
   "osd_conformance": "not reviewed", 
   "maintainer": "Creative Commons", 
   "status": "active", 
-  "title": "Attribution-NoDerivatives 4.0 International (CC BY-ND 4.0) ", 
+  "title": "Attribution-NoDerivatives 4.0",
   "url": "https://creativecommons.org/licenses/by-nd/4.0/"
 }

licenses/groups/all.json

@@ -225,6 +225,45 @@
     "title": "Creative Commons Attribution-NonCommercial 4.0",
     "url": "https://creativecommons.org/licenses/by-nc/4.0/"
   },
+  "CC-BY-NC-ND-4.0": {
+    "domain_content": true,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "CC-BY-NC-ND-4.0",
+    "maintainer": "Creative Commons",
+    "od_conformance": "rejected",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Attribution-NonCommercial-NoDerivatives 4.0",
+    "url": "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+  },
+  "CC-BY-NC-SA-4.0": {
+    "domain_content": true,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "CC-BY-NC-SA-4.0",
+    "maintainer": "Creative Commons",
+    "od_conformance": "rejected",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Attribution-NonCommercial-ShareAlike 4.0",
+    "url": "https://creativecommons.org/licenses/by-nc-sa/4.0/"
+  },
+  "CC-BY-ND-4.0": {
+    "domain_content": true,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "CC-BY-ND-4.0",
+    "maintainer": "Creative Commons",
+    "od_conformance": "rejected",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Attribution-NoDerivatives 4.0",
+    "url": "https://creativecommons.org/licenses/by-nd/4.0/"
+  },
   "CC-BY-SA-4.0": {
     "domain_content": true,
     "domain_data": true,

licenses/jsonp/CC-BY-NC-ND-4.0.js

@@ -0,0 +1,14 @@
+license_callback({
+  "domain_content": true, 
+  "domain_data": true, 
+  "domain_software": false, 
+  "family": "", 
+  "id": "CC-BY-NC-ND-4.0", 
+  "od_conformance": "rejected", 
+  "osd_conformance": "not reviewed", 
+  "maintainer": "Creative Commons", 
+  "status": "active", 
+  "title": "Attribution-NonCommercial-NoDerivatives 4.0",
+  "url": "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+}
+);

licenses/jsonp/CC-BY-NC-SA-4.0.js

@@ -0,0 +1,14 @@
+license_callback({
+  "domain_content": true, 
+  "domain_data": true, 
+  "domain_software": false, 
+  "family": "", 
+  "id": "CC-BY-NC-SA-4.0", 
+  "od_conformance": "rejected", 
+  "osd_conformance": "not reviewed", 
+  "maintainer": "Creative Commons", 
+  "status": "active", 
+  "title": "Attribution-NonCommercial-ShareAlike 4.0",
+  "url": "https://creativecommons.org/licenses/by-nc-sa/4.0/"
+}
+);

licenses/jsonp/CC-BY-ND-4.0.js

@@ -0,0 +1,14 @@
+license_callback({
+  "domain_content": true, 
+  "domain_data": true, 
+  "domain_software": false, 
+  "family": "", 
+  "id": "CC-BY-ND-4.0", 
+  "od_conformance": "rejected",
+  "osd_conformance": "not reviewed", 
+  "maintainer": "Creative Commons", 
+  "status": "active", 
+  "title": "Attribution-NoDerivatives 4.0",
+  "url": "https://creativecommons.org/licenses/by-nd/4.0/"
+}
+);

licenses/jsonp/all.js

@@ -225,6 +225,45 @@ license_callback({
     "title": "Creative Commons Attribution-NonCommercial 4.0",
     "url": "https://creativecommons.org/licenses/by-nc/4.0/"
   },
+  "CC-BY-NC-ND-4.0": {
+    "domain_content": true,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "CC-BY-NC-ND-4.0",
+    "maintainer": "Creative Commons",
+    "od_conformance": "rejected",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Attribution-NonCommercial-NoDerivatives 4.0",
+    "url": "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+  },
+  "CC-BY-NC-SA-4.0": {
+    "domain_content": true,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "CC-BY-NC-SA-4.0",
+    "maintainer": "Creative Commons",
+    "od_conformance": "rejected",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Attribution-NonCommercial-ShareAlike 4.0",
+    "url": "https://creativecommons.org/licenses/by-nc-sa/4.0/"
+  },
+  "CC-BY-ND-4.0": {
+    "domain_content": true,
+    "domain_data": true,
+    "domain_software": false,
+    "family": "",
+    "id": "CC-BY-ND-4.0",
+    "maintainer": "Creative Commons",
+    "od_conformance": "rejected",
+    "osd_conformance": "not reviewed",
+    "status": "active",
+    "title": "Attribution-NoDerivatives 4.0",
+    "url": "https://creativecommons.org/licenses/by-nd/4.0/"
+  },
   "CC-BY-SA-4.0": {
     "domain_content": true,
     "domain_data": true,