Fabian Hofmann
|
97b20bc170
|
Merge branch 'master' into fix/retrieve-wdpa
|
2023-12-21 23:16:11 +01:00 |
|
Fabian Hofmann
|
ea6bcc9b20
|
Merge branch 'master' into fix/retrieve-wdpa
|
2023-12-21 23:15:58 +01:00 |
|
Fabian Hofmann
|
b5f8e8d206
|
Merge branch 'master' into fix/retrieve-wdpa
|
2023-12-21 23:14:56 +01:00 |
|
Fabian Hofmann
|
c3fd0e2177
|
Merge pull request #810 from PyPSA/env/restrict-snakemake
|
2023-12-21 23:14:28 +01:00 |
|
pre-commit-ci[bot]
|
3a474af71f
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-21 17:40:48 +00:00 |
|
euronion
|
25c5751565
|
Check WDPA url also a month forward
|
2023-12-21 18:39:06 +01:00 |
|
euronion
|
31f77bc888
|
Update environment.yaml
|
2023-12-21 17:52:34 +01:00 |
|
euronion
|
f251e89269
|
Update release_notes.rst
|
2023-12-21 17:52:31 +01:00 |
|
euronion
|
17a4f53b9d
|
Restrict snakemake version to < 8.0.0
|
2023-12-21 11:57:24 +01:00 |
|
pre-commit-ci[bot]
|
64300c26e5
|
[pre-commit.ci] pre-commit autoupdate (#806)
updates:
- [github.com/PyCQA/isort: 5.13.0 → 5.13.2](https://github.com/PyCQA/isort/compare/5.13.0...5.13.2)
- [github.com/psf/black: 23.11.0 → 23.12.0](https://github.com/psf/black/compare/23.11.0...23.12.0)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
|
2023-12-18 19:25:43 +00:00 |
|
Fabian Hofmann
|
179ab43ef9
|
Merge pull request #805 from PyPSA/env_fixes
Env fixes
|
2023-12-18 14:31:29 +01:00 |
|
Fabian
|
d39b579346
|
build_biomass_potentials: fix groupby and transpose
|
2023-12-18 12:56:08 +01:00 |
|
Fabian
|
cc08dff280
|
simplify_network: revert fillna
|
2023-12-18 12:44:21 +01:00 |
|
Fabian
|
4f67160993
|
fix snake format
|
2023-12-18 11:57:21 +01:00 |
|
martacki
|
22acdd03a0
|
omit future deprecation
|
2023-12-18 11:49:53 +01:00 |
|
martacki
|
ea42b3797d
|
simplify_network&pandas21: nans not supported
|
2023-12-18 11:43:04 +01:00 |
|
Fabian Hofmann
|
68aef7b628
|
constrain xarray more recent version
|
2023-12-18 11:23:32 +01:00 |
|
pre-commit-ci[bot]
|
ea3fdb6c15
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-18 08:58:15 +00:00 |
|
martacki
|
7e543ad0cc
|
base_network: fix pandas 2.1 issue
|
2023-12-18 09:57:05 +01:00 |
|
martacki
|
84d38228ae
|
fix environment
|
2023-12-18 09:35:17 +01:00 |
|
Fabian Neumann
|
798a6b8481
|
Merge pull request #804 from PyPSA/revert-719-blast-furnace-with-cc
Revert "Add option for carbon capture in integrated steelworks"
|
2023-12-14 16:30:40 +01:00 |
|
Fabian Neumann
|
43674bcee8
|
Revert "Add option for carbon capture in integrated steelworks"
|
2023-12-14 16:30:30 +01:00 |
|
pre-commit-ci[bot]
|
f0eae99a07
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-14 12:51:51 +00:00 |
|
Markus Millinger
|
0721a29a02
|
Merge branch 'PyPSA:master' into master
|
2023-12-14 13:48:16 +01:00 |
|
Fabian Neumann
|
b96bcf11a4
|
relax pypsa version constraint to allos 0.26.0
|
2023-12-12 18:31:24 +01:00 |
|
Fabian Neumann
|
c304738ea5
|
fix to restore compatibility with PyPSA v0.26.0
|
2023-12-12 18:18:03 +01:00 |
|
Fabian Neumann
|
dffe784704
|
address pandas 2.1.4 deprecation warnings on applymap and fillna(method='bfill')
|
2023-12-12 17:07:33 +01:00 |
|
Fabian Neumann
|
e0ca38be6e
|
Merge pull request #719 from PyPSA/blast-furnace-with-cc
Add option for carbon capture in integrated steelworks
|
2023-12-11 20:12:26 +01:00 |
|
Fabian Neumann
|
ea7a66b873
|
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
|
2023-12-11 20:10:46 +01:00 |
|
Fabian Neumann
|
f200292267
|
add release note
|
2023-12-11 20:10:29 +01:00 |
|
Fabian Neumann
|
9b2edd076b
|
ensure just a single focus_weights definition
|
2023-12-11 20:08:27 +01:00 |
|
Fabian Neumann
|
82ce4ee44e
|
Merge pull request #802 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
|
2023-12-11 20:05:33 +01:00 |
|
Fabian Neumann
|
938637013b
|
Merge pull request #801 from PyPSA/enspreso-zenodo
change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability
|
2023-12-11 20:05:13 +01:00 |
|
pre-commit-ci[bot]
|
d215f3f3f6
|
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.12.0 → 5.13.0](https://github.com/PyCQA/isort/compare/5.12.0...5.13.0)
|
2023-12-11 18:38:23 +00:00 |
|
Fabian Neumann
|
4ad22548e6
|
Merge pull request #321 from PyPSA/ukraine_hackathon
Support Ukraine and Moldova in the country list and in the dataset.
|
2023-12-11 18:26:51 +01:00 |
|
pre-commit-ci[bot]
|
aae5ffb6fd
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-11 17:25:24 +00:00 |
|
Fabian Neumann
|
0f3fb540ef
|
finalise ukraine_hackathon branch for merge
|
2023-12-11 18:24:57 +01:00 |
|
Thomas Gilon
|
889a5dd5a2
|
Fix typo in buses definition for oil boilers in add_industry in prepare_sector_network
|
2023-12-11 17:18:31 +01:00 |
|
Fabian Neumann
|
df40fdf904
|
Merge branch 'master' into ukraine_hackathon
|
2023-12-11 16:24:40 +01:00 |
|
Fabian Neumann
|
67438f3292
|
change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability
|
2023-12-11 16:03:45 +01:00 |
|
Fabian Neumann
|
4ed59eb4b4
|
Merge pull request #798 from tgi-climact/fix/distributed-generators
Fix nodal fraction with distributed generators
|
2023-12-11 14:02:16 +01:00 |
|
Fabian Neumann
|
8d509f4606
|
Merge pull request #796 from PyPSA/district_heating_share_0
district heating bugfix when no progress is assumed
|
2023-12-11 14:01:57 +01:00 |
|
Fabian Neumann
|
c560e216a6
|
Merge pull request #795 from PyPSA/highs-ipopt-cluster-fallback
for clustering fall back to ipopt when highs is solver
|
2023-12-11 14:01:16 +01:00 |
|
millingermarkus
|
d6a11c28c9
|
Added co2 storage shadow price output to csv
|
2023-12-11 10:49:44 +01:00 |
|
pre-commit-ci[bot]
|
e3ba0e50a7
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-08 09:35:15 +00:00 |
|
Thomas Gilon
|
1352f6c30e
|
Fix nodal fraction with distributed generators
|
2023-12-08 10:32:35 +01:00 |
|
pre-commit-ci[bot]
|
429b4ca680
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-06 16:01:04 +00:00 |
|
martacki
|
fd789932dd
|
district heating bugfix when no progress is assumed
|
2023-12-06 07:58:20 -08:00 |
|
Fabian Neumann
|
a59eb821ff
|
for clustering fall back to ipopt when highs is solver
|
2023-12-06 11:07:04 +01:00 |
|
Fabian Neumann
|
1b88dc7660
|
limit pypsa version until #793 resolved
|
2023-12-06 10:14:31 +01:00 |
|