Skip to content

Commit

Permalink
Merge branch 'dev' into wp_flex_changed_reinforcement
Browse files Browse the repository at this point in the history
  • Loading branch information
birgits committed Jan 18, 2024
2 parents e5add23 + 9966a20 commit 7b7a7e1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/tests-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Set up julia
if: runner.os == 'Linux' && matrix.python-version == 3.8 && matrix.name-suffix == 'coverage'
uses: julia-actions/setup-julia@v1
with:
version: "1.6"

- name: Install packages (Linux)
if: runner.os == 'Linux'
run: |
Expand Down
2 changes: 1 addition & 1 deletion edisgo/io/generators_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ def oedb(
* Removes decommissioned power and CHP plants (all plants that do not have a source
ID or whose source ID can not be matched to a new plant and are not of subtype
pv_rooftop, as these are handled in a separate function)
* Updates existing power plants (plants whose source ID is in
* Updates existing power plants (plants whose source ID
can be matched; solar, wind and CHP plants never have a source ID in
the future scenarios and are therefore never updated). The following two cases
are distinguished:
Expand Down
2 changes: 1 addition & 1 deletion edisgo/tools/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def add_basemap(ax, zoom=12):
Adds map to a plot.
"""
url = ctx.providers.Stamen.TonerLite
url = ctx.providers.CartoDB.Positron
xmin, xmax, ymin, ymax = ax.axis()
basemap, extent = ctx.bounds2img(xmin, ymin, xmax, ymax, zoom=zoom, source=url)
ax.imshow(basemap, extent=extent, interpolation="bilinear")
Expand Down

0 comments on commit 7b7a7e1

Please sign in to comment.