Skip to content

Commit 7b124da

Browse files
committed
Merge branch 'release/34-release-minor-version-0-2-0' into 'main'
Resolve "Release - Minor Version - 0.2.0" See merge request tum-ens/need/entise!29
2 parents 7cba701 + 044db7b commit 7b124da

5 files changed

Lines changed: 28 additions & 36 deletions

File tree

โ€ŽCHANGELOG.mdโ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
99
---
1010

1111
## [Unreleased]
12+
13+
14+
## [0.2.0] New architecture, methods and packaging - 2025-06-04
1215
### Added
1316
- Added a simple RC model for HVAC time series (`#12`, `!6`)
1417
- Added simpler functionality for dependent methods (`#18`, `!12`)

โ€ŽREADME.rstโ€Ž

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ EnTiSe
55

66
A simple tool for generating time series data related to energy systems and building operations.
77

8-
.. .. list-table::
8+
.. list-table::
99
:widths: auto
1010

1111
* - License
@@ -27,12 +27,12 @@ A simple tool for generating time series data related to energy systems and buil
2727
:backlinks: top
2828

2929
Introduction
30-
============
30+
=============
3131
**EnTiSe** (En-ergy Ti-me Se-ries) is a Python package designed to generate realistic time series data for various energy systems and building operations.
3232
It provides a flexible, pipeline- and strategy-based approach to create time series for different applications including HVAC, domestic hot water, electricity, mobility, and occupancy patterns.
3333

3434
Key Features
35-
------------
35+
-------------
3636
- Multiple time series types including DHW, HVAC, PV, and more in the works.
3737

3838
- Flexible pipeline- and strategy-based architecture for customizable time series generation.
@@ -43,17 +43,17 @@ Key Features
4343

4444

4545
Getting Started
46-
===============
46+
================
4747
To get started, follow these steps:
4848

4949
Requirements
50-
------------
50+
-------------
5151
- `Python <https://www.python.org/>`_ (3.10 or newer)
5252
- `Git <https://git-scm.com/>`_ for version control (optional, only for development)
5353

5454

5555
Installation
56-
------------
56+
-------------
5757
EnTiSe can be installed directly from PyPI:
5858

5959
.. code-block:: bash
@@ -84,7 +84,7 @@ Or clone the repository and install in development mode:
8484
Now you're ready to use EnTiSe! Check the examples directory for usage examples.
8585

8686
Repository Structure
87-
====================
87+
=====================
8888

8989
- **entise/**: Main project code organized in a Python package.
9090

@@ -97,15 +97,15 @@ Repository Structure
9797
- **examples/**: Example scripts demonstrating usage of the package.
9898

9999
Usage Guidelines
100-
================
100+
=================
101101

102102
Basic Usage
103-
-----------
103+
------------
104104

105105
EnTiSe provides two flexible ways to generate time series data:
106106

107107
Batch Processing
108-
~~~~~~~~~~~~~~~
108+
~~~~~~~~~~~~~~~~~
109109

110110
For generating multiple time series at once:
111111

@@ -137,7 +137,7 @@ For generating multiple time series at once:
137137
summary, df = gen.generate(data)
138138
139139
Direct Method Access
140-
~~~~~~~~~~~~~~~~~~~
140+
~~~~~~~~~~~~~~~~~~~~~
141141

142142
For working with individual methods directly:
143143

@@ -163,7 +163,7 @@ For working with individual methods directly:
163163
For more detailed examples, check the `examples` directory.
164164

165165
Supported or Planned Time Series Types
166-
---------------------------
166+
---------------------------------------
167167
EnTiSe supports generating time series for the following types:
168168

169169
Integrated:
@@ -185,32 +185,32 @@ Planned:
185185
- Wind energy
186186

187187
Documentation
188-
=============
188+
==============
189189

190190
Please see the `documentation <https://entise.readthedocs.io>`_ for further information.
191191

192192

193193
Contribution and Code Quality
194-
=============================
194+
==============================
195195
Everyone is invited to develop this repository.
196196
Please follow the workflow described in the `CONTRIBUTING.md <CONTRIBUTING.md>`_.
197197

198198
Coding Standards
199-
----------------
199+
-----------------
200200
This repository follows consistent coding styles. Refer to `CONTRIBUTING.md <CONTRIBUTING.md>`_ for detailed standards.
201201

202202
Changelog
203-
---------
203+
----------
204204
The changelog is maintained in the `CHANGELOG.md <CHANGELOG.md>`_ file.
205205
It lists all changes made to the repository.
206206
Follow instructions there to document any updates.
207207

208208
License and Citation
209-
====================
209+
=====================
210210
| The code of this repository is licensed under the **MIT License** (MIT).
211211
| See `LICENSE <LICENSE>`_ for rights and obligations.
212212
| See `CITATION.cff <CITATION.cff>`_ for citation of this repository.
213-
| Copyright: `EnTiSe <https://gitlab.lrz.de/tum-ens/need/entise>`_ ยฉ `TU Munich - ENS <https://www.epe.ed.tum.de/en/ens/homepage/>`_ | `MIT <LICENSE>`_
213+
| Copyright: `EnTiSe <https://gitlab.lrz.de/tum-ens/need/entise>`_ (c) `TU Munich - ENS <https://www.epe.ed.tum.de/en/ens/homepage/>`_ | `MIT <LICENSE>`_
214214
215215

216216
.. |badge_license| image:: https://img.shields.io/badge/license-MIT-blue

โ€ŽUSERS.cffโ€Ž

Lines changed: 0 additions & 9 deletions
This file was deleted.

โ€ŽVERSIONโ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ It always has the format `YYYY-MM-DD`, e.g. `1992-11-07`.
2525
- ๐Ÿ“ **Version Entry**: Format the new version entry as follows:
2626
```
2727
## [0.1.0] - 2022-01-01
28-
28+
2929
### Added
3030
- New feature
3131
- Another new feature
32-
32+
3333
### Changed
3434
- Change to existing feature
35-
35+
3636
### Fixed
3737
- Bug fix
3838
```
39-
39+
4040
### 2. Create a `Draft GitLab Release` Issue
4141
- ๐Ÿ™ **Template**: Use the `๐Ÿ“Release_Checklist` template for the issue.
4242
- ๐Ÿ™ **Issue**: Create a new issue in the repository with the title `Release - Minor Version - 0.1.0`.
4343
- ๐Ÿ™ **Description**: Fill in the details of the release, including the name, Git tag, release manager, and date.
4444
- ๐Ÿ™ **Workflow Checklist**: Check off the steps in the workflow checklist for the release.
45-
45+
4646
### 3. Update Version in Code
4747
- ๐Ÿ“ **File**: Locate the version variable in the code (in the template it can be found in [VERSION](VERSION)).
4848
- ๐Ÿ’ป **Update**: Change the version number to the new release version following SemVer.
@@ -62,7 +62,7 @@ It always has the format `YYYY-MM-DD`, e.g. `1992-11-07`.
6262
```bash
6363
git push --set-upstream origin release-1.5.0
6464
```
65-
65+
6666
### 5. Finalize and Merge
6767
- ๐Ÿ™ **Merge Request**: In GitLab, open a merge request (MR) from `release-1.5.0` into `main`.
6868
- ๐Ÿ™ **Review**: Assign reviewers to the MR and ensure all tests pass.
@@ -79,7 +79,7 @@ It always has the format `YYYY-MM-DD`, e.g. `1992-11-07`.
7979
git tag -a v1.5.0 -m "Release 1.5.0"
8080
git push origin v1.5.0
8181
```
82-
82+
8383
### 7. Create a GitLab Release (Optional)
8484
- ๐Ÿ™ **GitLab Release Page**: Go to the GitLab projectโ€™s Releases section and create a new release linked to the v1.5.0 tag.
8585
- ๐Ÿ“ **Release Notes**: Add release notes using information from the changelog.
@@ -145,4 +145,3 @@ git push
145145
- **Versioning**: Always increment the version correctly using `bump2version` before creating the final release.
146146
- **Publishing Reminder**: Ensure your PyPI credentials are correctly set up in GitLab CI/CD or local `.pypirc` configuration for seamless uploads.
147147
- **Final Check**: If issues arise post-release, refer to the [GitLab CI/CD guide](https://docs.gitlab.com/ee/development/cicd/) and [PyPI documentation](https://packaging.python.org/en/latest/) for troubleshooting.
148-

0 commit comments

Comments
ย (0)