From 13039db1a6f1e4aa0f1790b3472027e477a2df11 Mon Sep 17 00:00:00 2001 From: Luciano Resende Date: Mon, 4 Nov 2019 12:29:01 -0800 Subject: [PATCH] Move license information from COPYING.md Closes #4765 Fixes 2768 --- COPYING.md => LICENSE | 2 -- MANIFEST.in | 2 +- notebook/log.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) rename COPYING.md => LICENSE (99%) diff --git a/COPYING.md b/LICENSE similarity index 99% rename from COPYING.md rename to LICENSE index bd6397d45..d8478fc37 100644 --- a/COPYING.md +++ b/LICENSE @@ -1,5 +1,3 @@ -# Licensing terms - This project is licensed under the terms of the Modified BSD License (also known as New or Revised or 3-Clause BSD), as follows: diff --git a/MANIFEST.in b/MANIFEST.in index 13febef91..2dc56bcc1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include COPYING.md +include LICENSE include CONTRIBUTING.rst include README.md include package.json diff --git a/notebook/log.py b/notebook/log.py index 3621a70ca..af87528fe 100644 --- a/notebook/log.py +++ b/notebook/log.py @@ -2,7 +2,7 @@ # Copyright (c) Jupyter Development Team # # Distributed under the terms of the BSD License. The full license is in -# the file COPYING, distributed as part of this software. +# the file LICENSE, distributed as part of this software. #----------------------------------------------------------------------------- import json diff --git a/setup.cfg b/setup.cfg index 7c09d96b9..f347ba636 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ universal=0 [metadata] -license_file = COPYING.md +license_file = LICENSE [nosetests] warningfilters=module |.* |DeprecationWarning |notebook.* diff --git a/setup.py b/setup.py index 44846df74..33eda15eb 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ # # Distributed under the terms of the Modified BSD License. # -# The full license is in the file COPYING.md, distributed with this software. +# The full license is in the file LICENSE, distributed with this software. #----------------------------------------------------------------------------- import os