Skip to content

Commit

Permalink
Merge pull request #130 from LabSid-USP/v1.12.1-beta.1
Browse files Browse the repository at this point in the history
Bump version to v1.12.1-beta.1
  • Loading branch information
soaressgabriel authored May 17, 2023
2 parents e090448 + dbce80d commit 20da7ca
Show file tree
Hide file tree
Showing 19 changed files with 43 additions and 35 deletions.
2 changes: 1 addition & 1 deletion COPYING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2021-2022 LabSid PHA EPUSP. All rights reserved.
Copyright (C) 2021-2023 LabSid PHA EPUSP. All rights reserved.

RUBEM Hydrological is provided by the copyright holders "as is", without warranty
of any kind, expressed or implied, including but not limited to the warranties of
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
Copyright (C) 2021-2022 LabSid PHA EPUSP
Copyright (C) 2021-2023 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 @@ -652,7 +652,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 Hydrological Copyright (C) 2021-2022 LabSid PHA EPUSP
RUBEM Hydrological Copyright (C) 2021-2023 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
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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
6 changes: 3 additions & 3 deletions doc/about.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1><strong>RUBEM</strong> Hydrological</h1>
<h3>Version 1.11.17-alpha</h3>
<h3>Version 1.12.1-beta.1</h3>

<p><a href="https://rubem-hydrological.readthedocs.io/en/latest/changelog.html">Release
notes</a> &middot; <a href="https://rubem-hydrological.readthedocs.io/en/latest/license.html">Licenses
Expand Down Expand Up @@ -42,7 +42,7 @@ <h4>Development/Research team</h4>
</tbody>
</table>

<p>LabSid-PHA-USP thanks the support of the Fundo Patrimoial Amigos da Poli in the development of the QGIS plugin for
<p>LabSid/PHA/USP thanks the support of the Fundo Patrimonial Amigos da Poli in the development of the QGIS plugin for
the distributed hydrological model RUBEM.</p>

<p>&copy; 2021-2022 <a href="http://labsid.eng.br/Contato.aspx">LabSid</a></p>
<p>&copy; 2021-2023 <a href="https://labsid.poli.usp.br/contato/">LabSid</a></p>
8 changes: 4 additions & 4 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Sphinx==4.2.0
sphinx-rtd-theme==1.0.0
sphinxcontrib-email==0.3.5
sphinxcontrib-youtube==1.0.1
Sphinx
sphinx-rtd-theme
sphinxcontrib-email
sphinxcontrib-youtube
12 changes: 10 additions & 2 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ This is the list of changes to RUBEM Hydrological between each release. For full

For a list of known issues and their fixes, visit the `Github issues page <https://github.com/LabSid-USP/RUBEMHydrological/issues>`_.

Version 1.12.1-beta.1
----------------------

**Date**: May 17, 2023

- `@soaressgabriel <https://github.com/soaressgabriel>`_: Add Paraíba do Sul dataset (`#127 <https://github.com/LabSid-USP/RUBEMHydrological/pull/127>`_);
- `@soaressgabriel <https://github.com/soaressgabriel>`_: Fix execution and error handling for external executable (`#129 <https://github.com/LabSid-USP/RUBEMHydrological/pull/129>`_);

Version 1.11.17-alpha
----------------------

**Date**: February 08, 2022

- `@soaressgabriel <https://github.com/soaressgabriel>`_: Fix problem when trying to cancel window closure (`#96 <https://github.com/LabSid-USP/RUBEMHydrological/pull/123>`_);
- `@soaressgabriel <https://github.com/soaressgabriel>`_: Fix problem when load the first file of any map-series data (`#96 <https://github.com/LabSid-USP/RUBEMHydrological/pull/120>`_);
- `@soaressgabriel <https://github.com/soaressgabriel>`_: Fix problem when trying to cancel window closure (`#123 <https://github.com/LabSid-USP/RUBEMHydrological/pull/123>`_);
- `@soaressgabriel <https://github.com/soaressgabriel>`_: Fix problem when load the first file of any map-series data (`#120 <https://github.com/LabSid-USP/RUBEMHydrological/pull/120>`_);


Version 1.11.15-alpha
Expand Down
12 changes: 6 additions & 6 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 @@ -21,11 +21,11 @@

__author__ = "LabSid PHA EPUSP"
__email__ = "rubem.hydrological@labsid.eng.br"
__copyright__ = "Copyright 2021, LabSid PHA EPUSP"
__copyright__ = "Copyright 2021-2023, LabSid PHA EPUSP"
__license__ = "GPL"
__date__ = "2022-02-08"
__version__ = "1.11.17"
__release__ = __version__ + "-alpha"
__date__ = "2023-05-17"
__version__ = "1.12.1"
__release__ = __version__ + "-beta.1"

# RUBEM Hydrological documentation build configuration file, created by
# sphinx-quickstart on Sun Feb 12 17:11:03 2012.
Expand Down Expand Up @@ -86,7 +86,7 @@

# General information about the project.
project = "RUBEM Hydrological"
copyright = "2021, Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP & contributors"
copyright = "2021-2023, 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"

# The version info for the project you're documenting, acts as replacement for
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 Hydrological 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) 2021-2022 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
Copyright (C) 2021-2023 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) 2021-2022 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
Copyright (C) 2021-2023 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 metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name=RUBEM Hydrological
qgisMinimumVersion=3.0
description=Distributed hydrological model for water balance
version=1.11.17
version=1.12.1
author=LabSid-PHA-EPUSP
email=rubem.hydrological@labsid.eng.br

Expand Down
8 changes: 4 additions & 4 deletions plugin/__version__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__author__ = "LabSid PHA EPUSP"
__email__ = "rubem.hydrological@labsid.eng.br"
__copyright__ = "Copyright 2021-2022, LabSid PHA EPUSP"
__copyright__ = "Copyright 2021-2023, LabSid PHA EPUSP"
__license__ = "GPL"
__date__ = "2022-02-08"
__version__ = "1.11.17"
__release__ = __version__ + "-alpha"
__date__ = "2023-05-17"
__version__ = "1.12.1"
__release__ = __version__ + "-beta.1"
2 changes: 1 addition & 1 deletion plugin/core.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/dialog/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/report/item.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/report/plotter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/utils/raster.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/utils/workers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/validation/schemas.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 plugin/validation/validators.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
# Copyright (C) 2021-2022 LabSid PHA EPUSP
# Copyright (C) 2021-2023 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 pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "RUBEM Hydrological"
version = "1.11.17"
version = "1.12.1"
description = "Rainfall rUnoff Balance Enhanced Model (RUBEM) distributed hydrological model QGIS plugin to calculate monthly flows with changes in land use over time."
authors = ["LabSid PHA EPUSP <rubem.hydrological@labsid.eng.br>"]
license = "GPL v3"
Expand Down

0 comments on commit 20da7ca

Please sign in to comment.