Commit Graph

2618 Commits

Author SHA1 Message Date
Fabian Hofmann
e25fb02e9c
CI: make coincbc and ipopt installed by conda 2022-11-16 12:44:28 +01:00
Fabian Hofmann
24d6ca16ed
Merge pull request #280 from PyPSA/FabianHofmann-patch-1
Fix input listing in Snakefile
2022-11-16 12:23:36 +01:00
Fabian Hofmann
e1e18a50e7
Fix input listing in Snakefile 2022-11-16 12:18:58 +01:00
Fabian Neumann
d35d3c3c21
Merge pull request #197 from PyPSA/cp-env
Snakefile: export conda environment
2022-11-15 14:49:52 +01:00
Fabian Neumann
dcd394dd0a
Merge pull request #441 from PyPSA/shapely-geometry-length
build_bus_regions: fix shapely deprecation
2022-11-15 07:58:15 +01:00
Fabian
727688749c build_bus_regions: fix shapely deprecation 2022-11-15 07:45:13 +01:00
Fabian Neumann
5faaad02fa
Merge pull request #440 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-14 21:51:17 +01:00
pre-commit-ci[bot]
9eab3caf93
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/snakemake/snakefmt: v0.6.1 → v0.7.0](https://github.com/snakemake/snakefmt/compare/v0.6.1...v0.7.0)
2022-11-14 20:20:13 +00:00
euronion
ae8f601f0a Fix relative imports from subworkflow PyPSA-EUR 2022-11-14 09:38:09 +01:00
Fabian Neumann
16a92477f0 methanol in shipping 2022-11-13 18:25:32 +01:00
Fabian Neumann
84618b3ee1 distribute international shipping by port trade volumes 2022-11-13 13:43:05 +01:00
Fabian Neumann
3815d0da61 add release note 2022-11-10 15:31:25 +01:00
Fabian Neumann
6c51152ab5 config: shipping now defaults to (synthetic) oil demand not hydrogen 2022-11-10 15:29:52 +01:00
Fabian Neumann
a32b45dd23
Merge pull request #439 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-07 20:40:40 +01:00
pre-commit-ci[bot]
d6fd5132a0
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/keewis/blackdoc: v0.3.7 → v0.3.8](https://github.com/keewis/blackdoc/compare/v0.3.7...v0.3.8)
2022-11-07 19:37:17 +00:00
Fabian Neumann
c8d09da145
Merge pull request #271 from nnhjy/patch-1
Update make_summary.py
2022-11-03 13:55:26 +01:00
Huang, Jiangyi
80868e5f0f
Update make_summary.py
The value for `na_action` needs to be "ignore" or "None".
2022-11-03 13:46:20 +01:00
Fabian Neumann
2db5931246
Merge pull request #438 from pz-max/tutorial-fix
fix tutorial config links
2022-11-01 11:57:00 +01:00
Max Parzen
d04e19f9a8 fix tutorial config links 2022-11-01 10:39:14 +00:00
Fabian Neumann
b356f08982
Merge pull request #437 from PyPSA/build-natura-raster-correct-shapes
build_natura_raster: fix out_shapes
2022-10-31 12:09:43 +01:00
Fabian
0b2989c987 build_natura_raster: fix out_shapes 2022-10-31 11:47:21 +01:00
Fabian Neumann
6d13b40ab7
Merge pull request #435 from aodenweller/bugfix_make_summary
Fix network directory path in make_summary
2022-10-25 15:35:44 +02:00
pre-commit-ci[bot]
dcd16e32a8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-25 13:23:20 +00:00
Adrian Odenweller
73b0645c13 Fix network directory path in make_summary 2022-10-25 14:29:07 +02:00
Fabian Neumann
de0e21aec3 Merge branch 'improve-doc' of github.com:martavp/pypsa-eur-sec into martavp-improve-doc 2022-10-25 09:46:28 +02:00
martavp
f6e017257e correct small spelling mistakes 2022-10-25 09:29:49 +02:00
martavp
11585429b0 small spelling corrections 2022-10-25 09:28:18 +02:00
martavp
9bc0e2afb7 update description of mechanical and chemical recycling of plastics 2022-10-25 09:23:35 +02:00
martavp
0b53e34f58
Merge pull request #22 from Adam-Dvorak1/improve-doc
Final industry sections, latex math edits, formatting unification, typo fixes
2022-10-25 09:04:07 +02:00
Fabian Neumann
776596ab9a
Merge pull request #270 from nnhjy/master
untrack *.json
2022-10-18 13:55:57 +02:00
Fabian Neumann
041abadf3c
Merge pull request #431 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-10-17 22:27:59 +02:00
pre-commit-ci[bot]
26fa33b414
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/codespell-project/codespell: v2.2.1 → v2.2.2](https://github.com/codespell-project/codespell/compare/v2.2.1...v2.2.2)
2022-10-17 20:01:25 +00:00
Fabian Neumann
d2f757eff4
Merge pull request #430 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-10-11 06:43:53 +02:00
pre-commit-ci[bot]
721c8f9235
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 22.8.0 → 22.10.0](https://github.com/psf/black/compare/22.8.0...22.10.0)
2022-10-10 20:31:00 +00:00
Adam-Dvorak1
e9ffaac223 Small edits 2022-10-07 19:10:05 +02:00
Adam-Dvorak1
a3268604c2 config file. 2022-10-07 19:02:12 +02:00
Adam-Dvorak1
b4457a75e3 latex formatting 2022-10-07 18:49:37 +02:00
Adam-Dvorak1
87c444c898 formatting latex math 2022-10-07 18:46:39 +02:00
Adam-Dvorak1
c3d2213402 Typos 2022-10-07 18:39:07 +02:00
Adam-Dvorak1
0f86d52c03 Typos and formatting 2022-10-07 18:37:43 +02:00
Adam-Dvorak1
5ca89f8955 Typos and modeled to modelled (UK version) 2022-10-07 18:31:36 +02:00
Adam-Dvorak1
c2cf870876 Minor edits 2022-10-07 18:24:52 +02:00
Adam-Dvorak1
6bc99291c9 Other industry subsectors 2022-10-07 18:10:58 +02:00
Adam-Dvorak1
dfd0d080ed Update supply_demand.rst 2022-10-07 17:05:34 +02:00
Adam-Dvorak1
59027615c8 Replacing CO2 2022-10-07 16:54:57 +02:00
Adam-Dvorak1
9e40a0f5f2
Add non-metallic mineral products title 2022-10-07 16:42:43 +02:00
Adam-Dvorak1
9cd701496c
Adding chemistry section 2022-10-07 16:38:50 +02:00
Adam-Dvorak1
f3f08340af
Update supply_demand.rst 2022-10-07 16:23:39 +02:00
Adam-Dvorak1
e13292da71
Update supply_demand.rst 2022-10-07 16:22:09 +02:00
Adam-Dvorak1
374a7900f3
Linking test 2022-10-07 16:17:54 +02:00