Skip to content

Commit aae1196

Browse files
committed
Merge branch 'merge-upstream-260617' into feat/extend-tyndp-archive
2 parents 4184927 + ab0e243 commit aae1196

8 files changed

Lines changed: 1777 additions & 703 deletions

doc/release_notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,14 @@
3737

3838
* Update benchmarking documentation tables and figures for v0.7.1 ([#711](https://github.com/open-energy-transition/open-tyndp/pull/711)).
3939

40+
* Migrate the Sphinx/RST-based documentation to MkDocs/Markdown, as a follow-up to the [upstream migration](https://github.com/PyPSA/pypsa-eur/pull/2162) ([754](https://github.com/open-energy-transition/open-tyndp/pull/754)).
41+
4042
**Developers Note**
4143

4244
* Change GitHub issue templates to comply with ISO security checks ([#714](https://github.com/open-energy-transition/open-tyndp/pull/714), [#730](https://github.com/open-energy-transition/open-tyndp/pull/730)).
4345

46+
* Introduce SBOM/Grype vulnerability scanning workflow, as a follow-up to the [upstream addition](https://github.com/PyPSA/pypsa-eur/pull/2164) ([754](https://github.com/open-energy-transition/open-tyndp/pull/754)).
47+
4448

4549
## Upcoming PyPSA-Eur Release
4650
* Security: SBOM security scan included in CI.

envs/default_linux-64.pin.txt

Lines changed: 50 additions & 25 deletions
Large diffs are not rendered by default.

envs/default_osx-64.pin.txt

Lines changed: 48 additions & 23 deletions
Large diffs are not rendered by default.

envs/default_osx-arm64.pin.txt

Lines changed: 43 additions & 22 deletions
Large diffs are not rendered by default.

envs/default_win-64.pin.txt

Lines changed: 65 additions & 43 deletions
Large diffs are not rendered by default.

envs/environment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- ipython >=9.7.0
2727
- jpype1 >=1.6.0
2828
- libgdal-netcdf >=3.10.3
29-
- linopy >=0.6.1
29+
- linopy >=0.6.1,<0.7.0
3030
- lxml >=6.0.2
3131
- matplotlib >=3.10.7
3232
- memory_profiler >=0.61.0

pixi.lock

Lines changed: 1565 additions & 588 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ highspy = ">=1.12.0"
7575
ipython = ">=9.7.0"
7676
jpype1 = ">=1.6.0"
7777
libgdal-netcdf = ">=3.10.3"
78-
linopy = ">=0.6.1"
78+
linopy = ">=0.6.1,<0.7.0"
7979
lxml = ">=6.0.2"
8080
matplotlib = ">=3.10.7"
8181
memory_profiler = ">=0.61.0"

0 commit comments

Comments
 (0)