Merge pull request #109 from empowerplan/feature/integrate_oemof_tsam…

…_datapackage

Integrate oemof tsam datapackage

CHANGELOG.md

@@ -18,6 +18,8 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe
 - update mapengine to v1.4.1
 - Update layer list and replace wind and pv ground model data from MaStR with
   data from RPG
+- django-oemof to v0.18.0
+- oemof.tabular to support TSAM
 
 ### Changed
 - pre results can be shown before simulation has finished

README.md

@@ -41,6 +41,12 @@ curl -sSL https://install.python-poetry.org | python3 -
 poetry install
 ```
 
+Install oemof.tabular manually, as there is currently a problem with poetry:
+
+```
+pip install git+https://github.com/oemof/oemof-tabular@features/add-tsam-to-datapackage
+```
+
 The project uses [pre-commit](https://pre-commit.com/) in order to check for errors and
 linting bugs before commits.
 To activate pre-commit simply run:

compose/local/django/Dockerfile

@@ -60,6 +60,9 @@ SHELL ["/bin/bash", "-c"]
 COPY ./pyproject.toml ./poetry.lock ./
 RUN source /venv/bin/activate && python -m pip install --upgrade pip && pip install --no-cache-dir poetry && poetry install --no-root
 
+# Install oemof.tabular manually as there is a problem with poetry
+RUN source /venv/bin/activate && python -m pip install git+https://github.com/oemof/oemof-tabular@features/add-tsam-to-datapackage
+
 COPY ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint

compose/production/django/Dockerfile

@@ -71,6 +71,9 @@ SHELL ["/bin/bash", "-c"]
 COPY ./pyproject.toml ./poetry.lock ./
 RUN source /venv/bin/activate && python -m pip install --upgrade pip && pip install --no-cache-dir poetry && poetry install --no-root --without dev
 
+# Install oemof.tabular manually as there is a problem with poetry
+RUN source /venv/bin/activate && python -m pip install git+https://github.com/oemof/oemof-tabular@features/add-tsam-to-datapackage
+
 COPY ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint