From 37ee39774cf206dce2ec66e50da27a3bdf5aeb63 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Mon, 27 Feb 2017 12:05:55 +0100 Subject: [PATCH] make the 1.2 release --- README.md | 9 +++++++-- make_release.py | 12 ++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 78e35cb..abd0e38 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ release or re-license their work to a Creative Common License of their choice. ## Available CC licenses -Currently 100% of the assets found in the LE fall under either the CC0 or CC-BY license. +Currently 100% of the assets found in the LE fall under one of the Creative Commons licenses. As more content creators are contacted, they can pick a CC license that bests suites them. @@ -26,10 +26,15 @@ purposes without restriction under copyright or database law. ### CC-BY CC-BY is a license which only stipulates that you include the original author's name with -the work, including all derived work. +the work. - CC-BY https://creativecommons.org/licenses/by/4.0/ +### CC-BY-NC +CC-BY-NC is the same as CC-BY except that it can't be used for commercial use. + + - CC-BY-NC https://creativecommons.org/licenses/by-nc/4.0/ + ## People you should thank Alain "Spyder" Brunotte, released over a 1300 assets under the CC0 license. Spyder wrote: diff --git a/make_release.py b/make_release.py index 984efe0..0fac593 100755 --- a/make_release.py +++ b/make_release.py @@ -6,7 +6,7 @@ import sys import tarfile -RELEASE_PATH = "uixr-assets-cc0-1.1.tar" +RELEASE_PATH = "uixr-assets-le-1.2.tar" ASSET_PATH = "../../../Private" @@ -34,7 +34,8 @@ def either(c): additional_assets = [] print("Gathering assets: ") for row in uixr_data: - if row.get('license').lower() == 'cc0': + row_license = row.get('license').lower() + if row_license == 'cc0' or row_license == 'cc-by' or row_license == 'cc-by-nc': sys.stdout.write("\033[K") sys.stdout.write(next(spinner)) sys.stdout.write(" [{0}]".format(row.get('asset'))) @@ -85,9 +86,12 @@ def either(c): f.seek(0) # reset to beginning of csv file for row in uixr_data: if row.get('asset').lower() == relative_asset_path.lower(): - if row.get('license').lower() == 'cc0': + row_license = row.get('license').lower() + if row_license == 'cc0': break # good to go, break - elif row.get('license').lower() == 'cc-by': + elif row_license == 'cc-by': + break # good to go, break + elif row_license == 'cc-by-nc': break # good to go, break else: print("WARNING: Non-CC license asset -> {0}".format(relative_asset_path))