Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.36.0 #3584

Merged
merged 15 commits into from
May 21, 2024
48 changes: 25 additions & 23 deletions .github/workflows/setup_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ jobs:
repository: architecture-building-systems/CityEnergyAnalyst-GUI

- name: Package CEA GUI
shell: bash
shell: bash -el {0}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GUI_GH_TOKEN }}
run: |
cd $GITHUB_WORKSPACE/gui
yarn
yarn version --new-version $CEA_VERSION --no-git-tag-version
yarn version $CEA_VERSION
yarn electron:release
mv "out/CityEnergyAnalyst-GUI Setup ${CEA_VERSION}.exe" $GITHUB_WORKSPACE/setup/gui_setup.exe

Expand All @@ -92,15 +92,23 @@ jobs:
compression-level: 0

build_mac_dmg:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macos-12", "macos-14"]
runs-on: "macos-12"
steps:
- uses: actions/checkout@v4
with:
path: cea

- uses: actions/setup-python@v5
with:
python-version: '3.8'

- name: Install CEA to python environment
run: pip install ${{ github.workspace }}/cea

- name: Get CEA version
shell: bash
run: echo "CEA_VERSION=$(python -c "import cea; print(cea.__version__)")" >> "$GITHUB_ENV"

- uses: actions/checkout@v4
with:
path: gui
Expand All @@ -109,36 +117,30 @@ jobs:
- uses: mamba-org/setup-micromamba@v1
with:
micromamba-binary-path: gui/dependencies/micromamba
environment-name: cea
create-args: >-
python=3.8

- name: Install CEA to environment
shell: bash -el {0}
run: pip install ./cea

- name: Get CEA version
shell: bash -el {0}
run: echo "CEA_VERSION=$(python -c "import cea; print(cea.__version__)")" >> "$GITHUB_ENV"

- name: Save Apple API Key secret to file
env:
APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
run: |
echo -n $APPLE_API_KEY_BASE64 | base64 -d -o ${{ github.workspace }}/gui/api_key.p8

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Enable Corepack
run: corepack enable

- name: Package CEA GUI
shell: bash
env:
APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
APPLE_API_KEY: ${{ github.workspace }}/gui/api_key.p8
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
CSC_LINK: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
CSC_KEY_PASSWORD: ${{ secrets.P12_PASSWORD }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GUI_GH_TOKEN }}
run: |
cd gui
yarn
yarn version --new-version $CEA_VERSION --no-git-tag-version
yarn electron:release

yarn version $CEA_VERSION
yarn electron:release --arm64 --x64
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
- 2024-05-16 - 3.35.6 - #3583 Use MKL for Windows to solve memory errors
- 2024-05-15 - 3.35.6 - #3574 Add trees as shading for radiation script
- 2024-05-14 - 3.35.6 - #3576 Consider adjacent walls by default
- 2024-05-14 - 3.35.6 - #3579 Hotfix two decentralised optimisation workflow test
- 2024-05-10 - 3.35.6 - #3575 Hotfix-decentralised-optimisaiton-test
- 2024-05-07 - 3.35.6 - #3550 Optimisation - Calculate the baseline system
- 2024-05-07 - 3.35.6 - #3572 Fixing database to fit the long unit test
- 2024-05-07 - 3.35.6 - #3552 3524 memory error in optimisation script
- 2024-05-07 - 3.35.6 - #3570 removing _new.xlsx in the databases
- 2024-04-30 - 3.35.6 - #3567 Fixing oudated excel writer
- 2024-04-29 - 3.35.6 - #3566 Push Docker build to GitHub Container Registry
- 2024-04-29 - 3.35.6 - #3521 Add German Building Database
- 2024-04-26 - 3.35.6 - #3563 Return empty data even if surroundings file is empty
- 2024-04-25 - 3.35.6 - #3562 Remove `MULTIUSER_PAGE_INSTALLMODE`
- 2024-04-25 - 3.35.6 - #3561 Update deprecated pandas append function
- 2024-04-24 - 3.35.6 - #3559 Remove multiuser option from setup
- 2024-04-18 - 3.35.6 - #3553 Enable auto update for windows
- 2024-04-18 - 3.35.6 - #3543 Fixing interaction between energy potentials and supply system operation
- 2024-04-18 - 3.35.6 - #3549 Handling zero interest rates
- 2024-04-12 - 3.35.6 - #3548 Update mac build workflow
- 2024-04-02 - 3.35.5 - #3539 Add build tools to environment
- 2024-03-21 - 3.35.5 - #3536 Fix missing html template for plots
- 2024-03-21 - 3.35.5 - #3535 Update workflow and docs based on new GUI build steps
- 2024-03-21 - 3.35.5 - #3533 Release 3.35.5
- 2024-03-20 - 3.35.4 - #3531 Correctly set installation directory for CurrentUser mode for Windows setup
- 2024-03-20 - 3.35.4 - #3530 Add missing schema keys
- 2024-03-16 - 3.35.4 - #3525 Fix Windows setup bugs regarding developer version
Expand Down
42 changes: 41 additions & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
How to Cite
===========

The CEA Team. (2024). City Energy Analyst (v3.35.5). Zenodo. https://doi.org/10.5281/zenodo.10847779
The CEA Team. (2024). City Energy Analyst (v3.36.0). Zenodo. https://doi.org/10.5281/zenodo.10950383

The CEA team
============
Expand All @@ -11,6 +11,46 @@ and split into the categories of developers, product owner, project sponsor and


<!-- credits -->
- Version 3.36.0 - May 2024

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)
* [Toni Piëch Foundation](https://www.tonipiechfoundation.org/)

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.35.5 - March 2024

Developers:
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
:alt: Repo Size
.. |lines_of_code| image:: https://img.shields.io/tokei/lines/github/architecture-building-systems/CityEnergyAnalyst
:alt: Lines of code
.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.10847779.svg
:target: https://doi.org/10.5281/zenodo.10847779
.. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.10950383.svg
:target: https://doi.org/10.5281/zenodo.10950383

.. image:: cea_logo.png
:scale: 25 %
Expand All @@ -33,4 +33,4 @@ We invite all CEA users to get acquainted with the CEA Dashboard and CEA Console
Cite us:
--------

The CEA Team. (2024). City Energy Analyst (v3.35.5). Zenodo. https://doi.org/10.5281/zenodo.10847779
The CEA Team. (2024). City Energy Analyst (v3.36.0). Zenodo. https://doi.org/10.5281/zenodo.10950383
2 changes: 1 addition & 1 deletion cea/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "3.35.6"
__version__ = "3.36.0"


class ConfigError(Exception):
Expand Down