Commit Graph

3483 Commits

Author SHA1 Message Date
Fabian Neumann
c900f849de
Merge pull request #828 from PyPSA/fix-deprecations
Address recent deprecations
2024-01-02 17:04:07 +01:00
pre-commit-ci[bot]
e580ac85d9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-02 15:33:11 +00:00
Fabian Neumann
30c1a1c857 address deprecation warnings 2024-01-02 16:31:48 +01:00
Fabian Neumann
e3539b0e69 heat vent: add bus 2024-01-02 16:31:16 +01:00
Fabian Neumann
ceddecd705
Merge pull request #648 from PyPSA/misc/deprecations
[DNMY] Address pandas deprecation of date_parser for pandas.read_csv
2024-01-02 09:35:25 +01:00
Fabian Neumann
1417ed7554
Merge pull request #826 from jessLryan/broken_link
Update index.rst
2024-01-02 07:13:29 +01:00
Jess
adf2c96dc1 Update index.rst
fixed 2 broken links
2024-01-01 12:14:38 +00:00
Fabian Neumann
0f6887793b
Merge pull request #820 from PyPSA/pypsa-0.26.1
increase pypsa min version to 0.26.1
2023-12-29 15:43:09 +01:00
pre-commit-ci[bot]
de3b6c9573 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-29 11:38:43 +00:00
Fabian Neumann
71985d5e3a validate checksums for zenodo downloads 2023-12-29 12:34:14 +01:00
Fabian Neumann
a54d00d745
Merge pull request #819 from PyPSA/retrieve-to-data
Retrieve GLC and WDPA to data directory, not resources
2023-12-29 11:37:14 +01:00
Fabian Neumann
e097aa48ae
Merge branch 'master' into misc/deprecations 2023-12-29 11:36:19 +01:00
Fabian Neumann
9761988859 increase pypsa min version to 0.26.1 2023-12-29 11:32:53 +01:00
Fabian Neumann
02b0996dac remove write-protection on resources/natura.tiff 2023-12-29 11:29:19 +01:00
Fabian Neumann
4f815a9cd7 move wdpa and glc datasets to data directory and protect 2023-12-29 11:29:01 +01:00
Fabian Neumann
6ee82e030f
Merge pull request #818 from PyPSA/wdpa-no-bYYYY
WDPA time-invariant resource files
2023-12-29 11:22:24 +01:00
Fabian Neumann
accffe7bc2 wdpa time-invariant filenames in build_electricity.smk 2023-12-29 11:21:24 +01:00
Fabian Neumann
c5f48f957d wdpa: give snakemake appearance of time-invariant wdpa files 2023-12-29 11:20:40 +01:00
Fabian Neumann
471c97d499 wdpa: correct _shp url 2023-12-29 11:20:14 +01:00
Fabian Neumann
396fdee6f1
Merge pull request #812 from Climact/fix/typo-prepare-sector-network
Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks
2023-12-29 10:47:41 +01:00
Fabian Neumann
40b7cc1f51
Merge pull request #811 from PyPSA/fix/retrieve-wdpa
Check WDPA url also a month forward
2023-12-29 10:46:29 +01:00
Fabian Neumann
57b4724ebe
Merge pull request #803 from millingermarkus/master
Added co2 storage shadow price output to csv
2023-12-29 10:41:41 +01:00
Fabian Neumann
9551642c95
Merge pull request #815 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-12-29 10:39:04 +01:00
pre-commit-ci[bot]
3c3d49017e
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.12.0 → 23.12.1](https://github.com/psf/black/compare/23.12.0...23.12.1)
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.11.0 → v2.12.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.11.0...v2.12.0)
2023-12-25 18:33:27 +00:00
pre-commit-ci[bot]
fec641ce0a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-22 13:41:25 +00:00
euronion
d817212896 Fix missing bYYYY 2023-12-22 14:40:30 +01:00
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