Commit Graph

2514 Commits

Author SHA1 Message Date
Fabian Neumann
e14382239e try shapely 2.0 2022-12-27 11:43:02 +01:00
Fabian Neumann
70d07d561f address pandas deprecations 2022-12-27 11:42:32 +01:00
Fabian Neumann
8bd840c252 limit numpy < 1.24 2022-12-27 11:30:33 +01:00
Fabian Neumann
3d7c354d2b merge master 2022-12-27 11:16:39 +01:00
Fabian Neumann
99343b1221
Merge pull request #277 from PyPSA/int-ports
distribute international shipping by port trade volumes
2022-12-27 10:57:01 +01:00
Fabian Neumann
bab7c3128d
Merge branch 'master' into update-env 2022-12-27 10:51:49 +01:00
Fabian Neumann
06bee06d56 update pypsa, vresutils master, lift fione restriction 2022-12-27 10:51:02 +01:00
Fabian Neumann
63de3e5f88
Merge pull request #456 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-27 07:48:45 +01:00
pre-commit-ci[bot]
09d89130b5
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: v5.11.3 → 5.11.4](https://github.com/PyCQA/isort/compare/v5.11.3...5.11.4)
- [github.com/snakemake/snakefmt: v0.7.0 → v0.8.0](https://github.com/snakemake/snakefmt/compare/v0.7.0...v0.8.0)
2022-12-26 21:14:52 +00:00
Fabian Hofmann
bff0ae2f0f
Merge pull request #453 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-20 09:49:27 +01:00
pre-commit-ci[bot]
d36a44f23c
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.11.0 → v5.11.3](https://github.com/PyCQA/isort/compare/5.11.0...v5.11.3)
- [github.com/PyCQA/docformatter: v1.5.0 → v1.5.1](https://github.com/PyCQA/docformatter/compare/v1.5.0...v1.5.1)
2022-12-19 20:31:18 +00:00
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2 2022-12-16 12:20:58 +00:00
Fabian Neumann
a22dc9238d
Merge pull request #451 from PyPSA/pz-max-patch-1
Fix load variable in reserve constraint
2022-12-16 13:18:57 +01:00
Max Parzen
17a8bc3c39
Update release_notes.rst 2022-12-16 11:06:36 +00:00
Max Parzen
9e61e30ff4
Fix EQ constraint in case no hydro exist 2022-12-16 11:00:39 +00:00
Max Parzen
3dac13ac3b
Update release_notes.rst 2022-12-16 10:58:24 +00:00
Max Parzen
b7899787cf
Fix load variable in reserve constraint 2022-12-16 10:50:20 +00:00
virio-andreyana
1a7dd850f2 remove excel file Europe-Gas-Tracker-August-2022 2022-12-15 12:34:11 +01:00
virio-andreyana
e1776518c0 Merge remote-tracking branch 'origin/update-lng-ports' into update-lng-ports 2022-12-15 12:20:05 +01:00
virio-andreyana
55ff725e3b Final edit to update LNG ports. Remove unused files 2022-12-15 11:42:21 +01:00
Fabian Neumann
bc8ac24c33
Merge pull request #449 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-15 10:52:10 +01:00
virio-andreyana
d37cd49f7d add script for retrieving lng terminals 2022-12-14 12:26:16 +01:00
virio-andreyana
01f48a50e7 Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker 2022-12-14 12:26:16 +01:00
pre-commit-ci[bot]
aba84201b7
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.10.1 → 5.11.0](https://github.com/PyCQA/isort/compare/5.10.1...5.11.0)
- [github.com/psf/black: 22.10.0 → 22.12.0](https://github.com/psf/black/compare/22.10.0...22.12.0)
2022-12-12 20:56:00 +00:00
Adam-Dvorak1
985cd8bae1 Refine math in myopic.rst 2022-12-09 10:37:41 +01:00
Fabian Neumann
cf56810fcc
Merge pull request #445 from PyPSA/extra_functionality_to_args
solve_network: move extra_functionality to args
2022-12-08 14:32:09 +01:00
Fabian Neumann
8421c46e7d
Merge branch 'master' into extra_functionality_to_args 2022-12-08 14:31:57 +01:00
Fabian Neumann
d6eea55be4
Merge pull request #447 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-08 14:30:07 +01:00
Martha Frysztacki
e632381560
Merge branch 'master' into extra_functionality_to_args 2022-12-07 15:38:17 +01:00
virio-andreyana
4f3510e3cc Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker 2022-12-07 10:36:54 +01:00
Fabian Neumann
01cc146733 lift minimum pypsa version, pyomo 6.4.3 compatibility 2022-12-06 14:38:40 +01:00
pre-commit-ci[bot]
253f6f6bcc
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.4.0 → v2.5.0](https://github.com/macisamuele/language-formatters-pre-commit-hooks/compare/v2.4.0...v2.5.0)
- [github.com/fsfe/reuse-tool: v1.0.0 → v1.1.0](https://github.com/fsfe/reuse-tool/compare/v1.0.0...v1.1.0)
2022-12-05 20:21:06 +00:00
Fabian Neumann
0c62bfc9ee complete methanol for shipping 2022-12-03 12:22:05 +01:00
Adam-Dvorak1
bf0b52b8ae More refining 2022-12-02 16:15:28 +01:00
Adam-Dvorak1
2eefba3b95 Start refining
Fixing typos
2022-12-02 15:58:57 +01:00
Fabian Neumann
7208d96039
Update config.default.yaml
Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>
2022-12-01 17:18:48 +01:00
Fabian Neumann
4d40893fd9
Merge pull request #446 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-29 11:39:00 +01:00
pre-commit-ci[bot]
5220d80564
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0)
2022-11-28 21:18:51 +00:00
Fabian Neumann
b756ca6590
Merge pull request #287 from PyPSA/VOM-onwind
take VOM for RES from existing
2022-11-28 18:52:18 +01:00
lisazeyen
5b256bfa5d take VOM for RES from existing 2022-11-28 16:56:42 +01:00
Fabian Neumann
4c8a1cbe27 Merge branch 'martavp-improve-doc' 2022-11-27 18:39:15 +01:00
Fabian Neumann
88db7a458f minor fixes 2022-11-27 18:38:32 +01:00
Fabian Neumann
5ee9e976b8 Merge branch 'improve-doc' of github.com:martavp/pypsa-eur-sec into martavp-improve-doc 2022-11-27 18:30:07 +01:00
Fabian Neumann
c44f1d61c7 remove hard-coded methanol efficiency 2022-11-27 18:28:57 +01:00
Fabian Neumann
f295064df2
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 18:21:17 +01:00
Fabian Neumann
7f1a0f7c9a
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 18:20:15 +01:00
martavp
d5758f2863
Merge branch 'master' into improve-doc 2022-11-27 14:11:51 +01:00
martavp
cfff99054a
Update doc/supply_demand.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 14:00:06 +01:00
martavp
55025e1234
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:49:55 +01:00
martavp
dac1eb1792
Update doc/spatial_resolution.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
2022-11-27 13:49:43 +01:00