Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
nesnoj committed Dec 9, 2024
2 parents 2291dc2 + 111f422 commit a905c2a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe

### Fixed

## [1.1.2] - 2024-12-09
### Fixed
- mapengine version in v2.2.10

## [1.1.1] - 2024-12-09
### Added
- Intro tour
Expand Down
2 changes: 1 addition & 1 deletion digiplan/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Digiplan init - holds current version."""

__version__ = "1.1.1"
__version__ = "1.1.2"
__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")])
8 changes: 4 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "empowerplan"
version = "1.1.1"
version = "1.1.2"
description = "EmPowerPlan"
authors = [
"Hendrik Huyskens <[email protected]>",
Expand Down Expand Up @@ -36,7 +36,7 @@ django-geojson = "^3.1.0"
# Custom apps
# -----------------------------------------------------------------------------poetry-
django-oemof = {git="https://github.com/rl-institut/django-oemof.git", tag="v0.18.1"}
django-mapengine = "2.2.9"
django-mapengine = "2.2.10"
geojson = "^3.0.1"
oemof-network = "0.5.0a5"
django-template-partials = "^23.4"
Expand Down

0 comments on commit a905c2a

Please sign in to comment.