Merge pull request #107 from LabSid-USP/v0.2.3-beta.2

Bump version to v0.2.3-beta.2
LabSid-USP · Jan 24, 2024 · 5aca5d4 · 5aca5d4
2 parents fd2c8ae + 30e33d6
commit 5aca5d4
Show file tree

Hide file tree

Showing 27 changed files with 45 additions and 38 deletions.
diff --git a/COPYING.md b/COPYING.md
@@ -1,4 +1,4 @@
-Copyright (C) 2020-2023 LabSid PHA EPUSP. All rights reserved.
+Copyright (C) 2020-2024 LabSid PHA EPUSP. All rights reserved.
 
 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

diff --git a/LICENSE b/LICENSE
@@ -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-2023  LabSid PHA EPUSP
+    Copyright (C) 2020-2024  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
@@ -654,7 +654,7 @@ Also add information on how to contact you by electronic and paper mail.
 notice like this when it starts in an interactive mode:
 
 <<<<<<< HEAD:LICENSE.md
-    RUBEM  Copyright (C) 2020-2023  LabSid PHA EPUSP
+    RUBEM  Copyright (C) 2020-2024  LabSid PHA EPUSP
 =======
     RUBEM Copyright (C) 2020-2021  LabSid-PHA-EPUSP
 >>>>>>> 75-update-datasets-download-links-on-the-doc-pages:LICENSE

diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -5,6 +5,13 @@ This is the list of changes to RUBEM between each release. For full details, see
 
 For a list of known issues and their fixes, visit the `Github issues page <https://github.com/LabSid-USP/RUBEM/issues>`__.
 
+Version 0.2.3-beta.2
+---------------------
+
+**Date**: Jan 24, 2024
+
+- `@soaressgabriel <https://github.com/soaressgabriel>`__: Fix error in the implementation of the Total Discharge equation (`#106 <https://github.com/LabSid-USP/RUBEM/pull/106>`__);
+
 Version 0.2.2-beta.1
 ---------------------
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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
@@ -45,7 +45,7 @@
 
 project = "Rainfall rUnoff Balance Enhanced Model (RUBEM)"
 copyright = (
-    "2020-2023, Laboratório de Sistemas de Suporte a Decisões Aplicados à"
+    "2020-2024, Laboratório de Sistemas de Suporte a Decisões Aplicados à"
     " Engenharia Ambiental e de Recursos Hídricos (LabSid) PHA-EPUSP &"
     " contributors"
 )

diff --git a/doc/source/license.rst b/doc/source/license.rst
@@ -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-2023 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
+Copyright (C) 2020-2024 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.
 
@@ -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-2023 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
+Copyright (C) 2020-2024 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".
 

diff --git a/metadata.yml b/metadata.yml
@@ -2,6 +2,6 @@ Version: version.txt
 CompanyName: LabSid/PHA/EPUSP
 FileDescription: Rainfall rUnoff Balance Enhanced Model (RUBEM)
 InternalName: rubem
-LegalCopyright: © 2020-2023 - LabSid/PHA/EPUSP. All rights reserved.
+LegalCopyright: © 2020-2024 - LabSid/PHA/EPUSP. All rights reserved.
 OriginalFilename: rubem.exe
-ProductName: RUBEM
+ProductName: RUBEM
diff --git a/rubem/__init__.py b/rubem/__init__.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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
@@ -28,8 +28,8 @@
 
 __author__ = "LabSid PHA EPUSP"
 __email__ = "[email protected]"
-__copyright__ = "Copyright (C) 2020-2023 - LabSid/PHA/EPUSP"
+__copyright__ = "Copyright (C) 2020-2024 - LabSid/PHA/EPUSP"
 __license__ = "GPL"
-__date__ = "2023-05-17"
-__version__ = "0.2.2"
-__release__ = f"{__version__}-beta.1"
+__date__ = "2023-01-24"
+__version__ = "0.2.3"
+__release__ = f"{__version__}-beta.2"
diff --git a/rubem/_dynamic_model.py b/rubem/_dynamic_model.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/cli.py b/rubem/cli.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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
@@ -53,7 +53,7 @@ def main():
         prog="rubem",
         description="Rainfall rUnoff Balance Enhanced Model (RUBEM)",
         epilog=(
-            f"RUBEM {__release__} Copyright (C) 2020-2023 - LabSid/PHA/EPUSP -"
+            f"RUBEM {__release__} Copyright (C) 2020-2024 - LabSid/PHA/EPUSP -"
             "This program comes with ABSOLUTELY NO WARRANTY."
             "This is free software, and you are welcome to redistribute it "
             "under certain conditions."

diff --git a/rubem/core.py b/rubem/core.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/date/__init__.py b/rubem/date/__init__.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/date/_date_calc.py b/rubem/date/_date_calc.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/file/__init__.py b/rubem/file/__init__.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/file/_file_convertions.py b/rubem/file/_file_convertions.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/file/_file_generators.py b/rubem/file/_file_generators.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/modules/__init__.py b/rubem/modules/__init__.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/modules/_evapotranspiration.py b/rubem/modules/_evapotranspiration.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/modules/_interception.py b/rubem/modules/_interception.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/modules/_soil.py b/rubem/modules/_soil.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/modules/_surface_runoff.py b/rubem/modules/_surface_runoff.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/preprocessing/__init__.py b/rubem/preprocessing/__init__.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/preprocessing/kriging.py b/rubem/preprocessing/kriging.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/preprocessing/pcrtss2tif.py b/rubem/preprocessing/pcrtss2tif.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/preprocessing/tif2map.py b/rubem/preprocessing/tif2map.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/preprocessing/tif2pcrtss.py b/rubem/preprocessing/tif2pcrtss.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/rubem/validation/_schemas.py b/rubem/validation/_schemas.py
@@ -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-2023 LabSid PHA EPUSP
+# Copyright (C) 2020-2024 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

diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py
@@ -19,17 +19,17 @@ def test_email_str(self):
 
     def test_copyright_str(self):
         self.assertEqual(
-            "Copyright (C) 2020-2023 - LabSid/PHA/EPUSP", __copyright__
+            "Copyright (C) 2020-2024 - LabSid/PHA/EPUSP", __copyright__
         )
 
     def test_license_str(self):
         self.assertEqual("GPL", __license__)
 
     def test_date_str(self):
-        self.assertEqual("2023-05-17", __date__)
+        self.assertEqual("2023-01-24", __date__)
 
     def test_version_str(self):
-        self.assertEqual("0.2.2", __version__)
+        self.assertEqual( "0.2.3", __version__)
 
     def test_release_str(self):
-        self.assertEqual("0.2.2-beta.1", __release__)
+        self.assertEqual("0.2.3-beta.2", __release__)