Merge pull request #3333 from architecture-building-systems/release-3…

….33.0

Release 3.33.0

CHANGELOG.md

@@ -1,3 +1,23 @@
+- 2023-06-28 - 3.32.0 - #3331 Fix EV input validation in editor
+- 2023-06-28 - 3.32.0 - #3324 Fixed deap-creator error
+- 2023-06-28 - 3.32.0 - #3306 Read and write sensor data using feather instead of json
+- 2023-06-28 - 3.32.0 - #3287 Simplified radiation script
+- 2023-06-28 - 3.32.0 - #3260 Update of the centralised optimisation algorithm
+- 2023-06-17 - 3.32.0 - #3328 Update environment.yml
+- 2023-05-25 - 3.32.0 - #3305 Fix aggregation for solar potential scripts
+- 2023-05-21 - 3.32.0 - #3313 changes
+- 2023-04-28 - 3.32.0 - #3301 Return temporary path as string instead of using temp directory object
+- 2023-04-27 - 3.32.0 - #3162 Update jenkins documentation
+- 2023-02-08 - 3.32.0 - #3284 Radiation refactoring
+- 2023-01-30 - 3.32.0 - #3278 Browser GUI
+- 2023-01-06 - 3.32.0 - #3272 Bugfix around GDF-completion
+- 2023-01-04 - 3.32.0 - #3267 Fix various typos
+- 2023-01-04 - 3.32.0 - #3268 GRID_MWhyr in total demands can't handle cases where components provide 'nan' values
+- 2023-01-03 - 3.32.0 - #3277 Add file explorer api
+- 2022-12-26 - 3.32.0 - #3276 Refactor and update config
+- 2022-11-23 - 3.32.0 - #3238 Use shapes tagged as `building:part` in OSM as well as `building` in `zone_helper`
+- 2022-11-22 - 3.32.0 - #3234 Several fixes to zone_helper to solve issues found after selecting fix_overlapping
+- 2022-11-13 - 3.32.0 - #3263 Release 3.32.0
 - 2022-11-10 - 3.31.0 - #3262 CEA installation fix
 - 2022-11-09 - 3.31.0 - #3261 Automate windows setup build
 - 2022-10-25 - 3.31.0 - #3258 Create setup_build.yml

CREDITS.md

@@ -1,7 +1,7 @@
 How to Cite
 ===========
 
-The CEA team, "City Energy Analyst v3.32.0", Zenodo, 2022, 10.5281/zenodo.7317134
+The CEA team, "City Energy Analyst v3.33.0", Zenodo, 2023, 10.5281/zenodo.8096788
 
 The CEA team
 ============
@@ -10,6 +10,44 @@ Starting from version 2.9.1 the credits are structured alphabetically (surname)
 scrum master, project owner, project sponsor and collaborators.
 
 <!-- credits -->
+- Version 3.33.0 - June 2023
+
+    Developers:
+    * [Amr Elesawy](https://cityenergyanalyst.com/people)
+    * [Jimeno A. Fonseca](https://cityenergyanalyst.com/people)
+    * [Gabriel Happle](https://cityenergyanalyst.com/people)
+    * [Shanshan Hsieh](https://cityenergyanalyst.com/people)
+    * [Reynold Mok](https://cityenergyanalyst.com/people)
+    * [Martín Mosteiro Romero](https://cityenergyanalyst.com/people)
+    * [Mathias Niffeler](https://cityenergyanalyst.com/people)
+    * [Anastasiya Popova](https://cityenergyanalyst.com/people)
+    * [Zhongming Shi](https://cityenergyanalyst.com/people)
+    * [Luis Santos](https://cityenergyanalyst.com/people)
+    * [Bhargava Krishna Sreepathi](https://cityenergyanalyst.com/people)
+    * [Daren Thomas](https://cityenergyanalyst.com/people)
+
+    Product lead:
+    * [Zhongming Shi](https://cityenergyanalyst.com/people)
+
+    Product sponsor:
+    * [Arno Schlueter](https://systems.arch.ethz.ch/arno-schlueter)
+
+    Collaborators:
+    * Jose Bello
+    * Kian Wee Chen
+    * Jack Hawthorne
+    * Fazel Khayatian
+    * Victor Marty
+    * Rowan Molony
+    * Paul Neitzel
+    * Thuy-An Nguyen
+    * Bo Lie Ong
+    * Emanuel Riegelbauer
+    * Lennart Rogenhofer
+    * Toivo Säwén
+    * Sebastian Troiztsch
+    * Tim Vollrath
+
 - Version 3.32.0 - November 2022
 
     Developers:

README.rst

@@ -40,4 +40,4 @@ allows to study the effects, trade-offs and synergies of urban design options, b
 Cite us:
 --------
 
-For V3.32.0 (stable): https://doi.org/10.5281/zenodo.7317134
+For V3.33.0 (stable): https://doi.org/10.5281/zenodo.7317134

cea/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.32.0"
+__version__ = "3.33.0"
 
 
 class ConfigError(Exception):

cea/dev/release.py

@@ -51,8 +51,15 @@ def update_credits(current_version: str, new_version: str):
 
 
 def update_changelog() -> None:
+    try:
+        subprocess.run(["git", "rev-parse", "--is-inside-work-tree"], check=True, capture_output=True,
+                       cwd=os.path.dirname(__file__))
+    except subprocess.CalledProcessError:
+        raise Exception("Current CEA directory is not a git repository.")
+
     changelog_script_path = os.path.join(os.path.dirname(__file__), "..", "..", "bin", "create-changelog.py")
-    result = subprocess.run(["python", changelog_script_path], check=True, capture_output=True)
+    result = subprocess.run(["python", changelog_script_path], check=True, capture_output=True,
+                            cwd=os.path.dirname(__file__))
     changelog = result.stdout.decode()
 
     with open(changelog_path, "w") as f:
@@ -83,6 +90,5 @@ def main(config: cea.config.Configuration) -> None:
 
 if __name__ == "__main__":
     cea_config = cea.config.Configuration()
-    version = cea_config.development.release_version
 
-    main(version)
+    main(cea_config)

setup/dashboard.bat

@@ -1,2 +1,2 @@
 CALL "%~dp0cea-env.bat"
-CALL "%~dp0Dependencies\Python\python.exe" -u -m cea.interfaces.cli.cli dashboard
+CALL "%~dp0Dependencies\Python\python.exe" -u -m cea.interfaces.cli.cli dashboard --browser false