Conversation
|
Changes in configuration options are added in config/config.electricity.yaml. |
|
Great, could you try and resolve the merge conflicts so that we can have a look? Generally, keeping the |
Fix minor issues
Merge pull request PyPSA#2 from lmezilis/wave-updates
for more information, see https://pre-commit.ci
|
Can you let me know if the conflicts are resolved? Apologies for delays, but I am a bit new to github and its procedures. |
|
@lmezilis They are, but you need to resolve the pre-commit checks now. See the failed check above or run it locally as described in the docs: https://pypsa-eur.readthedocs.io/en/latest/contributing.html |
…mrel into wave-updates
* doc: Automatically update DAGs in documentation * doc: Update release notes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * I find working with the CI always tricky * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * some adjustments --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: lkstrp <lkstrp@pm.me>
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
|
@lkstrp Ok, I think I completed that, please let me know if I missed anything. |
…into wave-updates
for more information, see https://pre-commit.ci
|
@fneum Hi Fabian, I have tried to resolve the integration (ubuntu or macos) but I cannot tell what is wrong with it. I tried to update the merge just in case that is the problem but please take a look if you have time. I decided to keep very basic changes on the |
Closes # (if applicable).
Changes proposed in this Pull Request
Checklist
envs/environment.yaml.config/config.default.yaml.doc/configtables/*.csv.doc/data_sources.rst.doc/release_notes.rstis added.