Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 48850431fb Snakefile: switch to new storage providers Fabian Neumann 2023-12-30 14:37:45 +0100
• 4349903a72 env: remove snakemake upper version constraint Fabian Neumann 2023-12-30 14:36:18 +0100
• 3c4e877844 Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality Fabian Neumann 2023-12-29 17:30:08 +0100
• a5ba2565a0 correct config location Fabian Neumann 2023-12-29 17:30:03 +0100
• 876a28b688 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-29 16:23:52 +0000
• fa13eae277 Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality Fabian Neumann 2023-12-29 17:23:24 +0100
• 4b6dd29083 add dummy file and assert path exists Fabian Neumann 2023-12-29 17:23:11 +0100
• fba320bfa7 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-29 16:20:24 +0000
• 8a11bdb4b1 solve_network: option to inject custom extra functionalities from source file Fabian Neumann 2023-12-29 17:19:19 +0100
• 0f6887793b
  Merge pull request #820 from PyPSA/pypsa-0.26.1 Fabian Neumann 2023-12-29 15:43:09 +0100
• 74cf849ac4 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-29 12:40:45 +0000
• 715aa25698 build_energy_totals: avoid deprecation warnings martacki 2023-12-29 13:40:00 +0100
• de3b6c9573 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-29 11:38:41 +0000
• 71985d5e3a validate checksums for zenodo downloads Fabian Neumann 2023-12-29 12:34:14 +0100
• a54d00d745
  Merge pull request #819 from PyPSA/retrieve-to-data Fabian Neumann 2023-12-29 11:37:14 +0100
• e097aa48ae
  Merge branch 'master' into misc/deprecations Fabian Neumann 2023-12-29 11:36:19 +0100
• 9761988859 increase pypsa min version to 0.26.1 Fabian Neumann 2023-12-29 11:32:53 +0100
• 02b0996dac remove write-protection on resources/natura.tiff Fabian Neumann 2023-12-29 11:29:19 +0100
• 4f815a9cd7 move wdpa and glc datasets to data directory and protect Fabian Neumann 2023-12-29 11:29:01 +0100
• 6ee82e030f
  Merge pull request #818 from PyPSA/wdpa-no-bYYYY Fabian Neumann 2023-12-29 11:22:24 +0100
• accffe7bc2 wdpa time-invariant filenames in build_electricity.smk Fabian Neumann 2023-12-29 11:21:24 +0100
• c5f48f957d wdpa: give snakemake appearance of time-invariant wdpa files Fabian Neumann 2023-12-29 11:20:40 +0100
• 471c97d499 wdpa: correct _shp url Fabian Neumann 2023-12-29 11:20:14 +0100
• 396fdee6f1
  Merge pull request #812 from Climact/fix/typo-prepare-sector-network Fabian Neumann 2023-12-29 10:47:41 +0100
• 40b7cc1f51
  Merge pull request #811 from PyPSA/fix/retrieve-wdpa Fabian Neumann 2023-12-29 10:46:29 +0100
• 57b4724ebe
  Merge pull request #803 from millingermarkus/master Fabian Neumann 2023-12-29 10:41:41 +0100
• 9551642c95
  Merge pull request #815 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2023-12-29 10:39:04 +0100
• ba928bf839
  Merge pull request #814 from yerbol-akhmetov/no_gas_gen Martha Frysztacki 2023-12-28 10:11:45 +0100
• a74fa9b3c2
  Merge branch 'master' into services_heat Martha Frysztacki 2023-12-28 10:10:34 +0100
• 61c54152b1
  Merge pull request #813 from yerbol-akhmetov/issue1_issue2 Martha Frysztacki 2023-12-28 10:07:12 +0100
• 0f41ff79cf update configtable for resistive_heaters yerbol-akhmetov 2023-12-28 13:53:15 +0600
• 640a4b1b2e update boilers description in confitables yerbol-akhmetov 2023-12-28 13:51:30 +0600
• 3c3d49017e
  [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-12-25 18:33:27 +0000
• 125c406013 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-23 08:55:56 +0000
• 1bee34d57f remove gas generators yerbol-akhmetov 2023-12-23 14:51:01 +0600
• 12096d1f2f update configtable by adding resistive_heaters yerbol-akhmetov 2023-12-23 12:55:50 +0600
• a3688a74fd add resistive_heaters option to config.default yerbol-akhmetov 2023-12-23 12:31:31 +0600
• fec641ce0a [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-22 13:41:23 +0000
• d817212896 Fix missing bYYYY euronion 2023-12-22 14:40:30 +0100
• 97b20bc170
  Merge branch 'master' into fix/retrieve-wdpa Fabian Hofmann 2023-12-21 23:16:11 +0100
• ea6bcc9b20
  Merge branch 'master' into fix/retrieve-wdpa Fabian Hofmann 2023-12-21 23:15:58 +0100
• b5f8e8d206
  Merge branch 'master' into fix/retrieve-wdpa Fabian Hofmann 2023-12-21 23:14:56 +0100
• c3fd0e2177
  Merge pull request #810 from PyPSA/env/restrict-snakemake Fabian Hofmann 2023-12-21 23:14:28 +0100
• 3a474af71f [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-21 17:40:46 +0000
• 25c5751565 Check WDPA url also a month forward euronion 2023-12-21 18:39:06 +0100
• 31f77bc888 Update environment.yaml euronion 2023-12-21 17:52:34 +0100
• f251e89269 Update release_notes.rst euronion 2023-12-21 17:52:31 +0100
• 8a55a55d20 copperplate oil/methanol supply; allow demand to be regional Tom Brown 2023-12-21 16:08:43 +0100
• 17e9b4d1df make resistive heaters separate of boilers yerbol-akhmetov 2023-12-21 20:59:35 +0600
• 25cfcaf97b fix add_waste_heat yerbol-akhmetov 2023-12-21 20:54:17 +0600
• 81041aa10e
  Merge pull request #809 from yerbol-akhmetov/fix_f_weighting Martha Frysztacki 2023-12-21 15:04:06 +0100
• 20b847c627 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-21 13:34:55 +0000
• 17a4f53b9d Restrict snakemake version to < 8.0.0 euronion 2023-12-21 11:57:24 +0100
• 7d64a73382 simplify node_name formulation martacki 2023-12-21 11:12:54 +0100
• 5ab9d149ba [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-21 10:07:51 +0000
• e8eb9df73f generalize bus name to allow higher spatial resolution martacki 2023-12-21 11:07:23 +0100
• 146fb170d8 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-21 09:41:13 +0000
• bb160d78b1 fix more deprecation warnings martacki 2023-12-21 10:40:10 +0100
• dfc2f06033 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-21 08:41:17 +0000
• 4d63a3f21b fix deprecation warnings martacki 2023-12-21 09:37:13 +0100
• f77f84af6a [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-20 19:27:56 +0000
• a292308c53 select correct sector name in endogeneous retrofitting martacki 2023-12-20 20:11:37 +0100
• 79f443ecbd fix f weighting for retro cost yerbol-akhmetov 2023-12-20 22:41:11 +0600
• b3753d73d7 undo addition of script to allow cost modifications Tom Brown 2023-12-20 09:22:40 +0100
• 64300c26e5
  [pre-commit.ci] pre-commit autoupdate (#806) pre-commit-ci[bot] 2023-12-18 19:25:43 +0000
• 179ab43ef9
  Merge pull request #805 from PyPSA/env_fixes Fabian Hofmann 2023-12-18 14:31:29 +0100
• d39b579346 build_biomass_potentials: fix groupby and transpose Fabian 2023-12-18 12:56:08 +0100
• cc08dff280 simplify_network: revert fillna Fabian 2023-12-18 12:44:21 +0100
• 4f67160993 fix snake format Fabian 2023-12-18 11:57:21 +0100
• 22acdd03a0 omit future deprecation martacki 2023-12-18 11:49:53 +0100
• ea42b3797d simplify_network&pandas21: nans not supported martacki 2023-12-18 11:43:04 +0100
• 68aef7b628
  constrain xarray more recent version Fabian Hofmann 2023-12-18 11:23:32 +0100
• ea3fdb6c15 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-18 08:58:13 +0000
• 7e543ad0cc base_network: fix pandas 2.1 issue martacki 2023-12-18 09:57:05 +0100
• 84d38228ae fix environment martacki 2023-12-18 09:35:17 +0100
• 1a7f093e03 solve: pass wildcards and config to additional_functionality Tom Brown 2023-12-15 17:18:36 +0100
• c5a123b4f4 allow additional functionality for solving to be added by file Tom Brown 2023-12-15 14:57:03 +0100
• 830019a6e5 add rule that allows cost data to be modified Tom Brown 2023-12-15 09:50:47 +0100
• 798a6b8481
  Merge pull request #804 from PyPSA/revert-719-blast-furnace-with-cc Fabian Neumann 2023-12-14 16:30:40 +0100
• 43674bcee8
  Revert "Add option for carbon capture in integrated steelworks" Fabian Neumann 2023-12-14 16:30:30 +0100
• f0eae99a07 [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-14 12:51:46 +0000
• 0721a29a02
  Merge branch 'PyPSA:master' into master Markus Millinger 2023-12-14 13:48:16 +0100
• b96bcf11a4 relax pypsa version constraint to allos 0.26.0 Fabian Neumann 2023-12-12 18:31:24 +0100
• c304738ea5 fix to restore compatibility with PyPSA v0.26.0 Fabian Neumann 2023-12-12 18:18:03 +0100
• dffe784704 address pandas 2.1.4 deprecation warnings on applymap and fillna(method='bfill') Fabian Neumann 2023-12-12 17:07:33 +0100
• e0ca38be6e
  Merge pull request #719 from PyPSA/blast-furnace-with-cc Fabian Neumann 2023-12-11 20:12:26 +0100
• ea7a66b873
  Merge pull request #794 from PyPSA/mv-focus-weights Fabian Neumann 2023-12-11 20:10:46 +0100
• f200292267 add release note Fabian Neumann 2023-12-11 20:10:29 +0100
• 9b2edd076b ensure just a single focus_weights definition Fabian Neumann 2023-12-11 20:08:27 +0100
• 82ce4ee44e
  Merge pull request #802 from PyPSA/pre-commit-ci-update-config Fabian Neumann 2023-12-11 20:05:33 +0100
• 938637013b
  Merge pull request #801 from PyPSA/enspreso-zenodo Fabian Neumann 2023-12-11 20:05:13 +0100
• d215f3f3f6
  [pre-commit.ci] pre-commit autoupdate pre-commit-ci[bot] 2023-12-11 18:38:23 +0000
• 4ad22548e6
  Merge pull request #321 from PyPSA/ukraine_hackathon Fabian Neumann 2023-12-11 18:26:51 +0100
• aae5ffb6fd [pre-commit.ci] auto fixes from pre-commit.com hooks pre-commit-ci[bot] 2023-12-11 17:25:22 +0000
• 0f3fb540ef finalise ukraine_hackathon branch for merge Fabian Neumann 2023-12-11 18:24:57 +0100
• 889a5dd5a2 Fix typo in buses definition for oil boilers in add_industry in prepare_sector_network Thomas Gilon 2023-12-11 17:18:31 +0100
• df40fdf904 Merge branch 'master' into ukraine_hackathon Fabian Neumann 2023-12-11 16:24:40 +0100
• 67438f3292 change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability Fabian Neumann 2023-12-11 16:03:45 +0100
• 4ed59eb4b4
  Merge pull request #798 from tgi-climact/fix/distributed-generators Fabian Neumann 2023-12-11 14:02:16 +0100
• 8d509f4606
  Merge pull request #796 from PyPSA/district_heating_share_0 Fabian Neumann 2023-12-11 14:01:57 +0100