Skip to content

Commit

Permalink
Merge pull request #307 from rl-institut-private/release/v0.5.0
Browse files Browse the repository at this point in the history
Release v0.5.0
  • Loading branch information
henhuy authored Jul 13, 2023
2 parents 3f5e8c1 + e4d9612 commit 3ec872b
Show file tree
Hide file tree
Showing 117 changed files with 7,116 additions and 2,914 deletions.
4 changes: 3 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"map_store": false,
"deactivateChoropleth": false,
"window": false,
"subscribeToEvents": false
"subscribeToEvents": false,
"createChart": false,
"hidePotentialLayers": false
},
"strict": "implied"
}
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ fail_fast: true

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-json
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-added-large-files

- repo: https://github.com/pre-commit/mirrors-jshint
rev: v2.13.5
rev: v2.13.6
hooks:
- id: jshint

- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black

- repo: https://github.com/charliermarsh/ruff-pre-commit
# Ruff version.
rev: 'v0.0.272'
rev: 'v0.0.277'
hooks:
- id: ruff

- repo: https://github.com/psf/black
rev: 23.1.0
hooks:
- id: black

- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.5.0] - 2023-07-13
### Added
- heat settings set for oemof simulation
- cluster popups
- url, view and calculations for result charts
- datapackage from digipipe
- models, layers and legend items from digipipe geodata

### Changed
- legend layer colors and symbols
- static layer order
- paths for oemof hooks to digipipe scalars

### Fixed
- units
- tour shows up after onboarding

## [0.4.0] - 2023-06-20
### Added
- complete energy settings
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ empty_data:
empty_raster:
python manage.py shell --command="from digiplan.utils import data_processing; data_processing.empty_raster()"

empty_simulations:
python manage.py shell --command="from django_oemof.models import Simulation; Simulation.objects.all().delete()"

distill:
python manage.py distill-local --force --exclude-staticfiles ./digiplan/static/mvts

Expand Down
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ Obviously, you have to clone this repo first.

## Prepare Data

In both cases, geometry packages have to be placed into folder _digiplan/data/_,
In both cases, the datapackage from digipipe have to be placed into folder _digiplan/data/_ and renamed into `digipipe`,
so that they can be found by the application and uploaded into database.
All packages are justed dropped into this folder (no hierarchy).

## Using standard python installation

Expand Down Expand Up @@ -260,3 +259,11 @@ Example to only load specific data:
```
docker-compose -f production.yml run --rm django python -u manage.py shell --command="from djagora.utils import load_overlays; from djagora.utils.load_configs import DYNAMIC_OVERLAYS; overlays = [item for item in DYNAMIC_OVERLAYS if item['name'].startswith('settlement')]; load_overlays.run(overlays=overlays)"
```
If celery does not complete, but shows no errors you can check redis for errors:
```bash
docker exec -it <redis-container> bash
redis-cli keys "*"
redis-cli get <task-meta-with-current-id>
```
1 change: 1 addition & 0 deletions config/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"""Initializes celery automatically."""
# This will make sure the app is always imported when
# Django starts so that shared_task will use this app.
from .celery import app as celery_app
Expand Down
1 change: 1 addition & 0 deletions config/celery.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"""Module to set up celery."""
import os

from celery import Celery
Expand Down
1 change: 1 addition & 0 deletions config/settings/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"""Settings init."""
Loading

0 comments on commit 3ec872b

Please sign in to comment.