From 9d2e30e40abeaef5664497c48920f3921ae822de Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Thu, 22 Apr 2021 16:28:39 -0400 Subject: [PATCH 1/2] DOC: Move license to root directory. MNT: Update license years. --- licenses/LICENSE.rst => LICENSE.rst | 2 +- licenses/README.rst | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) rename licenses/LICENSE.rst => LICENSE.rst (97%) diff --git a/licenses/LICENSE.rst b/LICENSE.rst similarity index 97% rename from licenses/LICENSE.rst rename to LICENSE.rst index a49f687d99..1683b9cf24 100644 --- a/licenses/LICENSE.rst +++ b/LICENSE.rst @@ -1,4 +1,4 @@ -Copyright 2020 JDADF Developers +Copyright 2020-2021 JDADF Developers Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/licenses/README.rst b/licenses/README.rst index fa84ca8e19..2645b55ad9 100644 --- a/licenses/README.rst +++ b/licenses/README.rst @@ -1,9 +1,8 @@ Licenses ======== -This directory holds license and credit information for the package, -works the package is derived from, and/or datasets. +This directory holds license and credit information for works the Jdaviz +package is derived from or distributes, and/or datasets. -Ensure that you pick a package license which is in this folder and it matches -the one mentioned in the top level README.rst file. If you are using the -pre-rendered version of this template check for the word 'Other' in the README. +The license file for the Jdaviz package itself is located in the root of +this repository. From bad104d972a21f7b97cc05507fbd70a4780e3374 Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Thu, 22 Apr 2021 16:34:49 -0400 Subject: [PATCH 2/2] Fix license path in setup --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 23758c0d1e..d9ed32fd2f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ name = jdaviz author = JDADF Developers author_email = nearl@stsci.edu license = BSD 3-Clause -license_file = licenses/LICENSE.rst +license_file = LICENSE.rst url = https://jdaviz.readthedocs.io/en/latest/ description = Astronomical data analysis development leveraging the Jupyter platform long_description = file: README.rst