diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..ba0e0de --- /dev/null +++ b/LICENCE @@ -0,0 +1,28 @@ +BSD 3-Clause License + +Copyright (c) 2023-2024, Climate Resource and contributors at https://github.com/climate-resource/pydoit-nb/contributors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/changelog/4.trivial.md b/changelog/4.trivial.md new file mode 100644 index 0000000..c5ab945 --- /dev/null +++ b/changelog/4.trivial.md @@ -0,0 +1 @@ +Added LICENCE diff --git a/tests/integration/test_doit_integration.py b/tests/integration/test_doit_integration.py index f2814d5..343521f 100644 --- a/tests/integration/test_doit_integration.py +++ b/tests/integration/test_doit_integration.py @@ -109,7 +109,7 @@ def test_task_display(example_project_dir, tmp_path_factory, file_regression): # This may require actually parsing the stdout. # Use a regression test to help us keep track of what stdout produces - file_regression.check(res_stdout) + file_regression.check(res_stdout.strip()) @pytest.mark.slow diff --git a/tests/integration/test_doit_integration/test_task_display.txt b/tests/integration/test_doit_integration/test_task_display.txt index ae1fbb6..0d294a9 100644 --- a/tests/integration/test_doit_integration/test_task_display.txt +++ b/tests/integration/test_doit_integration/test_task_display.txt @@ -17,4 +17,4 @@ R copy_source_into_output:copy raw config Copy required source files into R copy_source_into_output:copy raw notebooks Copy required source files into the output directory, making it easy to create a neat bundle for uploading to Zenodo. Copying in ('.../notebooks',) R copy_source_into_output:copy source Copy required source files into the output directory, making it easy to create a neat bundle for uploading to Zenodo. Copying in ('.../src',) R generate_workflow_tasks Generate tasks for the workflow -R generate_workflow_tasks:Show configuration +R generate_workflow_tasks:Show configuration