Skip to content

Commit

Permalink
Merge pull request #81 from LabSid-USP/74-update-copyright-period-info
Browse files Browse the repository at this point in the history
Update copyright strings
  • Loading branch information
soaressgabriel authored Mar 24, 2022
2 parents 9e318c0 + ae970dc commit e792da5
Show file tree
Hide file tree
Showing 26 changed files with 95 additions and 75 deletions.
62 changes: 31 additions & 31 deletions COPYING.md
Original file line number Diff line number Diff line change
@@ -1,84 +1,84 @@
Copyright (C) 2021 LabSid PHA EPUSP. All rights reserved.
Copyright (C) 2020-2022 LabSid PHA EPUSP. All rights reserved.

RUBEM is provided by the copyright holders "as is", without warranty
RUBEM is provided by the copyright holders "as is", without warranty
of any kind, expressed 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.

The RUBEM source code in this repository is provided under the terms
The RUBEM source code in this repository is provided under the terms
of the GNU GENERAL PUBLIC LICENSE (GPL) Version 3, see the [`LICENSE.md`](https://github.com/LabSid-USP/RUBEM/blob/main/LICENSE.md) file for more
details.

Visit https://github.com/LabSid-USP/RUBEM for more information.
Visit <https://github.com/LabSid-USP/RUBEM> for more information.

## Notice on third party software

RUBEM uses open source software from third parties. These are to their
individual license agreements. Any binary packages of these third party tools are
subject to their individual licenses. RUBEM reserves the right to
individual license agreements. Any binary packages of these third party tools are
subject to their individual licenses. RUBEM reserves the right to
change which third party tools are used.

- **GDAL** (https://www.gdal.org/)
- **GDAL** (<https://www.gdal.org/>)

> In general GDAL/OGR is licensed under an MIT/X style license with the following terms:
>
>
> 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:
>
>
> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
>
>
> 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.
- **NumPy** (https://www.numpy.org/)
- **NumPy** (<https://www.numpy.org/>)

> Copyright (c) 2005-2021, NumPy Developers.
> Copyright (c) 2005-2021, NumPy Developers.
>
> All rights reserved.
>
>
> 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.
- **Pandas** (https://www.pandas.pydata.org/)
- **Pandas** (<https://www.pandas.pydata.org/>)

> Copyright (c) 2008-2011, AQR Capital Management, LLC, Lambda Foundry, Inc. and PyData Development Team
>
> All rights reserved.
>
> Copyright (c) 2011-2021, Open source 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.
- **Python** (https://www.python.org/)
- **Python** (<https://www.python.org/>)

> 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 3.7.12 software in source or binary form and its associated documentation.
>
>
> 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 3.7.12 alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright © 2001-2021 Python Software Foundation; All Rights Reserved" are retained in Python 3.7.12 alone or in any derivative version prepared by Licensee.
>
>
> 3. In the event Licensee prepares a derivative work that is based on or incorporates Python 3.7.12 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python 3.7.12.
>
>
> 4. PSF is making Python 3.7.12 available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 3.7.12 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
>
>
> 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.7.12 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.7.12, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
>
>
> 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
>
>
> 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
>
>
> 8. By copying, installing or otherwise using Python 3.7.12, Licensee agrees to be bound by the terms and conditions of this License Agreement.
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ the "copyright" line and a pointer to where the full notice is found.

RUBEM is a distributed hydrological model to calculate monthly flows
with changes in land use over time.
Copyright (C) 2020-2021 LabSid PHA EPUSP
Copyright (C) 2020-2022 LabSid PHA EPUSP

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -653,7 +653,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

RUBEM Copyright (C) 2020-2021 LabSid PHA EPUSP
RUBEM Copyright (C) 2020-2022 LabSid PHA EPUSP
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
35 changes: 25 additions & 10 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -22,7 +22,7 @@

__author__ = "LabSid PHA EPUSP"
__email__ = "rubem.hydrological@labsid.eng.br"
__copyright__ = "Copyright 2020-2021, LabSid PHA EPUSP"
__copyright__ = "Copyright 2020-2022, LabSid PHA EPUSP"
__license__ = "GPL"
__date__ = "2021-11-23"
__version__ = "0.1.0"
Expand All @@ -49,8 +49,15 @@
# -- Project information -----------------------------------------------------

project = "Rainfall rUnoff Balance Enhanced Model (RUBEM)"
copyright = "2021, Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos (LabSid) PHA-EPUSP & contributors"
author = "Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos (LabSid) PHA-EPUSP & contributors"
copyright = (
"2020-2022, Laboratório de Sistemas de Suporte a Decisões Aplicados à"
" Engenharia Ambiental e de Recursos Hídricos (LabSid) PHA-EPUSP &"
" contributors"
)
author = (
"Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia"
" Ambiental e de Recursos Hídricos (LabSid) PHA-EPUSP & contributors"
)


# -- General configuration ---------------------------------------------------
Expand All @@ -77,7 +84,14 @@

# Turn on sphinx.ext.autosummary
autosummary_generate = True
autodoc_mock_imports = ["pcraster", "osgeo", "skgstat", "pykrige", "numpy", "pandas"]
autodoc_mock_imports = [
"pcraster",
"osgeo",
"skgstat",
"pykrige",
"numpy",
"pandas",
]
# Add __init__ doc (ie. params) to class summaries
autoclass_content = "both"
# Remove 'view source code' from top of page (for html, not python)
Expand All @@ -91,9 +105,7 @@
# Remove namespaces from class/method signatures
add_module_names = False

mathjax_path = (
"https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
)
mathjax_path = "https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLorMML"

# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
Expand Down Expand Up @@ -241,7 +253,8 @@
"index",
"RUBEMHydrological.tex",
"RUBEM Hydrological Documentation",
"Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP & contributors",
"Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia"
" Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP & contributors",
"manual",
),
]
Expand Down Expand Up @@ -280,7 +293,9 @@
"TemplateClass",
"RUBEM Hydrological Documentation",
[
"Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP & contributors"
"Laboratório de Sistemas de Suporte a Decisões Aplicados à"
" Engenharia Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP &"
" contributors"
],
1,
)
Expand Down
4 changes: 2 additions & 2 deletions doc/source/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Software

RUBEM is licensed under the `GNU General Public License, Version 3.0 or later <http://www.gnu.org/licenses/gpl-3.0.en.html>`_.

Copyright (C) 2020-2021 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
Copyright (C) 2020-2022 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version.

Expand All @@ -19,7 +19,7 @@ Documentation

This documentation is licensed under the `GNU Free Documentation License, Version 1.3 or later <http://www.gnu.org/licenses/fdl-1.3.en.html>`_.

Copyright (C) 2020-2021 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
Copyright (C) 2020-2022 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".

Expand Down
2 changes: 1 addition & 1 deletion rubem/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/__version__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__author__ = "LabSid PHA EPUSP"
__email__ = "rubem.hydrological@labsid.eng.br"
__copyright__ = "Copyright 2020-2021, LabSid PHA EPUSP"
__copyright__ = "Copyright 2020-2022, LabSid PHA EPUSP"
__license__ = "GPL"
__date__ = "2021-11-23"
__version__ = "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion rubem/_dynamic_model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions rubem/cli.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -40,7 +40,7 @@ def main():
prog="rubem",
description="Rainfall rUnoff Balance Enhanced Model (RUBEM)",
epilog=(
f"RUBEM {__release__} Copyright (C) 2020-2021 - LabSid PHA EPUSP -"
f"RUBEM {__release__} Copyright (C) 2020-2022 - LabSid PHA EPUSP -"
" This program comes with ABSOLUTELY NO WARRANTY. "
" This is free software, and you are welcome to redistribute it "
" under certain conditions."
Expand Down
2 changes: 1 addition & 1 deletion rubem/core.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/date/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/date/_date_calc.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/file/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/file/_file_convertions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/file/_file_generators.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/modules/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/modules/_evapotranspiration.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion rubem/modules/_interception.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding=utf-8
# RUBEM is a distributed hydrological model to calculate monthly
# flows with changes in land use over time.
# Copyright (C) 2020-2021 LabSid PHA EPUSP
# Copyright (C) 2020-2022 LabSid PHA EPUSP

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit e792da5

Please sign in to comment.