From 17ac13f1785c94e83590f32b1841c028a2f07214 Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Mon, 13 Sep 2021 10:52:39 +0200 Subject: [PATCH 1/5] test: revert later --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9d5f7979..14ef4fe7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,3 @@ # Inside of setup.cfg [metadata] -description-file = README.md \ No newline at end of file +description-file = README.mds \ No newline at end of file From d4be9b92d5c32b180ff3f1cd69ec44e159b1e658 Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Fri, 24 Sep 2021 10:23:18 +0200 Subject: [PATCH 2/5] Update requirements --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 59d771eb..e74bd5da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy>=1.19.5 matplotlib>=3.3.4 pandas>=1.1.5 -SALib==1.3.12 +SALib>=1.3.12 ebcpy>=0.2.1 toml>=0.10.2 \ No newline at end of file diff --git a/setup.py b/setup.py index b9a17405..1a4b7d19 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ 'numpy>=1.19.5', 'matplotlib>=3.3.4', 'pandas>=1.1.5', - 'SALib==1.3.12', + 'SALib>=1.3.12', 'ebcpy>=0.2.1', 'toml>=0.10.2' ] From cc4cf95ebeb0e5531809f8825dc512809011fee9 Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Fri, 24 Sep 2021 10:24:30 +0200 Subject: [PATCH 3/5] Update version --- CHANGELOG.md | 5 ++++- aixcalibuha/__init__.py | 2 +- docs/source/conf.py | 2 +- setup.py | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ffb0b5..5bce2467 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,4 +34,7 @@ - Adjust based on ebcpy v 0.2.0 - Add examples and fix tutorial - Improve validation output - - Fix version of SALib as 1.4 is not working \ No newline at end of file + - Fix version of SALib as 1.4 is not working + +- **v0.2.1** + - Unfix version of SALib as 1.4.0.2 and 1.4.4 are not working \ No newline at end of file diff --git a/aixcalibuha/__init__.py b/aixcalibuha/__init__.py index 8a3aaba1..e4c09a76 100644 --- a/aixcalibuha/__init__.py +++ b/aixcalibuha/__init__.py @@ -5,4 +5,4 @@ from .data_types import CalibrationClass, TunerParas, Goals from .calibration import Calibrator, MultipleClassCalibrator from .sensitivity_analysis import SobolAnalyzer, MorrisAnalyzer -__version__ = "0.2.0" +__version__ = "0.2.1" diff --git a/docs/source/conf.py b/docs/source/conf.py index 9b99f3bd..a94a6d71 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -67,7 +67,7 @@ # The short X.Y version. version = '0.2' # The full version, including alpha/beta/rc tags. -release = '0.2.0' +release = '0.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 1a4b7d19..e5ce9b26 100644 --- a/setup.py +++ b/setup.py @@ -13,12 +13,12 @@ setuptools.setup( name='aixcalibuha', - version='0.2.0', + version='0.2.1', description='Framework used for sensitivity-analysis' 'and calibration for models of HVAC ' 'components.', url='https://github.com/RWTH-EBC/AixCaliBuHA', - download_url='https://github.com/RWTH-EBC/AixCaliBuHA/archive/refs/tags/0.2.0.tar.gz', + download_url='https://github.com/RWTH-EBC/AixCaliBuHA/archive/refs/tags/0.2.1.tar.gz', license='MIT', author='RWTH Aachen University, E.ON Energy Research Center, Institute ' 'of Energy Efficient Buildings and Indoor Climate', From d0a00a918c0722a23357d2a5c30db57cfa5325eb Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Fri, 24 Sep 2021 10:29:06 +0200 Subject: [PATCH 4/5] revert mds --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 14ef4fe7..9d5f7979 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,3 @@ # Inside of setup.cfg [metadata] -description-file = README.mds \ No newline at end of file +description-file = README.md \ No newline at end of file From 81c44032edc9075c6e4c745e1f9751fde67aa04e Mon Sep 17 00:00:00 2001 From: "fabian.wuellhorst" Date: Fri, 24 Sep 2021 10:30:50 +0200 Subject: [PATCH 5/5] Fix version in requirements.txt only --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e74bd5da..cbf5b175 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy>=1.19.5 matplotlib>=3.3.4 pandas>=1.1.5 -SALib>=1.3.12 +SALib==1.4.5 ebcpy>=0.2.1 toml>=0.10.2 \ No newline at end of file