Commit Graph

2876 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
d527797dc3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 08:24:03 +00:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian Neumann
799f4f3731
Merge pull request #695 from PyPSA/multilinks-default
no more override_component_attrs for multilinks
2023-07-26 09:14:08 +02:00
Fabian Neumann
d17430d000
Merge branch 'master' into multilinks-default 2023-07-26 08:48:21 +02:00
pre-commit-ci[bot]
f970ba0fd0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 06:48:10 +00:00
Fabian Neumann
5231135d5f make_summary: explicitly typecast default values 2023-07-26 08:47:49 +02:00
Fabian Neumann
be57c527aa
Merge pull request #701 from PyPSA/ppl-fueltype-fix
match build_powerplants FuelType
2023-07-26 07:45:52 +02:00
Fabian Neumann
d64d20945b Merge remote-tracking branch 'origin/master' into multilinks-default 2023-07-26 07:30:10 +02:00
pre-commit-ci[bot]
74be5261fc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 05:24:33 +00:00
Fabian Neumann
7575dd0351 handling of natural gas in add_existing_baseyear and add_electricity 2023-07-26 07:24:12 +02:00
Fabian Neumann
93c14dcda1 Merge branch 'master' into ppl-fueltype-fix 2023-07-25 13:10:59 +02:00
lisazeyen
3e792cda86
Merge pull request #704 from PyPSA/tech-data-0.6
update to technology-data v0.6.0
2023-07-25 12:27:36 +02:00
Fabian Neumann
d96a747566 update to technology-data v0.6.0 2023-07-25 11:54:02 +02:00
Fabian Hofmann
3a6d7bdcd2
Merge branch 'master' into multilinks-default 2023-07-25 10:57:28 +02:00
Fabian Neumann
dca65c52b6
Merge pull request #703 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-07-25 10:17:13 +02:00
pre-commit-ci[bot]
2baeecbc4e
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/fsfe/reuse-tool: v2.0.0 → v2.1.0](https://github.com/fsfe/reuse-tool/compare/v2.0.0...v2.1.0)
2023-07-24 22:31:09 +00:00
Fabian Hofmann
3eac0c1127
Merge branch 'master' into multilinks-default 2023-07-24 13:42:50 +02:00
Fabian Neumann
68dc44d278
Merge pull request #679 from ricnogfer/master
Fix broken equity constraints logic
2023-07-23 15:05:58 +02:00
Fabian Neumann
81fcaf7740 follow-up: remove unnecessary conda calls 2023-07-23 15:03:13 +02:00
Fabian Neumann
1541877fdc Merge branch 'ppl-fueltype-fix' of github.com:PyPSA/pypsa-eur into ppl-fueltype-fix 2023-07-23 15:00:22 +02:00
Fabian Neumann
6110fe784d wrap comparisons in brackets 2023-07-23 14:59:28 +02:00
Fabian Neumann
5cab4f4f24
Merge branch 'master' into master 2023-07-23 11:21:13 +02:00
Fabian Neumann
264e7ca2f0
Merge branch 'master' into multilinks-default 2023-07-23 11:20:44 +02:00
Fabian Neumann
5c7339e4fc
Merge pull request #700 from PyPSA/micromamba
CI: use setup-micromamba action
2023-07-23 11:20:31 +02:00
pre-commit-ci[bot]
3f3e73a0ec [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-23 09:08:29 +00:00
Fabian Neumann
d45cb71b7a match build_powerplants FuelType (closes #754) 2023-07-23 11:07:45 +02:00
Fabian Neumann
9cc5be1c25 add note about supported operating systemds (closes #697) [no ci] 2023-07-23 11:02:48 +02:00
Fabian Neumann
c09f21ef50 Merge branch 'micromamba' of github.com:PyPSA/pypsa-eur into micromamba 2023-07-23 10:58:45 +02:00
Fabian Neumann
e0942d4544 CI: enable environment cache 2023-07-23 10:58:38 +02:00
pre-commit-ci[bot]
854b3b773c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-23 08:25:04 +00:00
Fabian Neumann
691cc7167f CI: use setup-micromamba action 2023-07-23 10:24:08 +02:00
Fabian Neumann
268391e204
Merge branch 'master' into master 2023-07-18 14:07:27 +02:00
Fabian Neumann
a0366fb2bc
Merge branch 'master' into multilinks-default 2023-07-18 14:05:57 +02:00
Fabian Neumann
6505d78f4e
Merge pull request #698 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-07-18 14:05:23 +02:00
pre-commit-ci[bot]
e5ce76bf48
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/docformatter: v1.7.4 → v1.7.5](https://github.com/PyCQA/docformatter/compare/v1.7.4...v1.7.5)
- [github.com/psf/black: 23.3.0 → 23.7.0](https://github.com/psf/black/compare/23.3.0...23.7.0)
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.9.0 → v2.10.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.9.0...v2.10.0)
2023-07-17 23:29:16 +00:00
Fabian Neumann
f39d737aa1
Merge pull request #694 from PyPSA/misc/autoretrieve
Add test and option to disable online retrieve rules
2023-07-17 21:44:40 +02:00
Fabian Hofmann
9936953b0f
Merge pull request #685 from PyPSA/describe-config
doc: update config section
2023-07-17 18:18:53 +02:00
Fabian Hofmann
dc4286d3e3
Merge branch 'master' into describe-config 2023-07-17 17:33:55 +02:00
Fabian Hofmann
7ff7a7ee34
Merge pull request #696 from PyPSA/cluster-network-update
cluster network: update to new clustering module (pypsa v0.25)
2023-07-17 16:17:57 +02:00
Fabian
00cb865ce0 env: force use pypsa from GH master 2023-07-17 15:37:30 +02:00
Fabian
d22c87419b update enviromnent yaml to install pypsa from master
cluster: allow custom strategies for all components
2023-07-17 14:03:16 +02:00
Fabian
8e568cee03 cluster network: remove bus strategies as already handled internally 2023-07-14 16:00:21 +02:00
Fabian
f566142d38 cluster network: update to new clustering module (pypsa v0.25) 2023-07-14 15:47:41 +02:00
pre-commit-ci[bot]
aa7a2c823a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-14 11:42:08 +00:00
euronion
7437f32c0f Update enable.csv 2023-07-14 13:41:25 +02:00
euronion
328e413b12 Update release_notes.rst 2023-07-14 13:41:22 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
5482c27e8b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-14 10:26:10 +00:00
virio-andreyana
23b154de36 adjust config table spacing 2023-07-14 12:25:23 +02:00
euronion
730b320596 Move logic to retrieve.smk 2023-07-14 08:53:39 +02:00