From fc480f336b91254ebe095951f847339bb9d551eb Mon Sep 17 00:00:00 2001 From: Yi-Te Huang Date: Sun, 26 May 2024 22:57:36 +0800 Subject: [PATCH 1/7] update LICENSE --- LICENSE | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 427e0012..80f95872 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,27 @@ -MIT License +Copyright (c) 2023 to 2024 inclusive, QuTiP developers and contributors. +All rights reserved. -Copyright (c) 2022 Alberto Mercurio +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +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. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +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. \ No newline at end of file From 5f6c20b3c0bf2639f553c7c27bc4339b37291db6 Mon Sep 17 00:00:00 2001 From: Yi-Te Huang Date: Sun, 26 May 2024 22:59:07 +0800 Subject: [PATCH 2/7] add CODE_OF_CONDUCT --- CODE_OF_CONDUCT.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..ddf531d0 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,25 @@ +# Contributor Covenant Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the Contributor Covenant , version 1.2.0, available at https://www.contributor-covenant.org/version/1/2/0/code-of-conduct.html + +[homepage]: https://contributor-covenant.org +[version]: https://contributor-covenant.org/version/1/2/ From 0f91b70f03563573375eebe373dbffc341179a92 Mon Sep 17 00:00:00 2001 From: Yi-Te Huang Date: Sun, 26 May 2024 23:10:27 +0800 Subject: [PATCH 3/7] add admin name list and in license badge in README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4241d2c3..8dd49c92 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,13 @@ # QuantumToolbox.jl + +[A. Mercurio](https://github.com/albertomercurio), +[L. Gravina](https://github.com/lgravina1997), +and [Y.-T. Huang](https://github.com/ytdHuang). + [![Release](https://img.shields.io/github/release/qutip/QuantumToolbox.jl.svg)](https://github.com/qutip/QuantumToolbox.jl/releases) +[![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10822816.svg)](https://doi.org/10.5281/zenodo.10822816) [![Downloads](https://img.shields.io/badge/dynamic/json?url=http%3A%2F%2Fjuliapkgstats.com%2Fapi%2Fv1%2Ftotal_downloads%2FQuantumToolbox&query=total_requests&label=Downloads)](https://juliapkgstats.com/pkg/QuantumToolbox) [![Build Status](https://github.com/qutip/QuantumToolbox.jl/actions/workflows/CI.yml/badge.svg?branch=main)](https://github.com/qutip/QuantumToolbox.jl/actions/workflows/CI.yml?query=branch%3Amain) From a2f1365624d30a06e324205afd5b47dc9473e4c5 Mon Sep 17 00:00:00 2001 From: Yi-Te Huang Date: Sun, 26 May 2024 23:19:57 +0800 Subject: [PATCH 4/7] add some comments in README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8dd49c92..61b33b29 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +
QuantumToolbox.jl logo
@@ -9,6 +10,7 @@ [L. Gravina](https://github.com/lgravina1997), and [Y.-T. Huang](https://github.com/ytdHuang). + [![Release](https://img.shields.io/github/release/qutip/QuantumToolbox.jl.svg)](https://github.com/qutip/QuantumToolbox.jl/releases) [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10822816.svg)](https://doi.org/10.5281/zenodo.10822816) From 963f303852165a0b64c87f45eb2e4923e91af986 Mon Sep 17 00:00:00 2001 From: Yi-Te Huang Date: Sun, 26 May 2024 23:24:03 +0800 Subject: [PATCH 5/7] adjust copyright holding year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 80f95872..2d11b97e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2023 to 2024 inclusive, QuTiP developers and contributors. +Copyright (c) 2022 to 2024 inclusive, QuTiP developers and contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, From 2c88dabda2eb5a04fe0be0cacecb52fe2a49ab88 Mon Sep 17 00:00:00 2001 From: Yi-Te Huang Date: Sun, 26 May 2024 23:27:49 +0800 Subject: [PATCH 6/7] ignore `CODE_OF_CONDUCT` in `JuliaFormatter` --- .JuliaFormatter.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.JuliaFormatter.toml b/.JuliaFormatter.toml index 18efd325..b75cd2ee 100644 --- a/.JuliaFormatter.toml +++ b/.JuliaFormatter.toml @@ -6,4 +6,7 @@ always_use_return=true format_docstrings=true indent_submodule=true format_markdown=true -ignore = ["README.md"] \ No newline at end of file +ignore = [ + "README.md", + "CODE_OF_CONDUCT.md" +] \ No newline at end of file From b541e5ddc69162656c882396e6c23d266cf148d1 Mon Sep 17 00:00:00 2001 From: Yi-Te Huang <44385685+ytdHuang@users.noreply.github.com> Date: Mon, 27 May 2024 01:22:45 +0800 Subject: [PATCH 7/7] Update LICENSE --- LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index 2d11b97e..40ba9329 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +BSD 3-Clause License + Copyright (c) 2022 to 2024 inclusive, QuTiP developers and contributors. All rights reserved.