Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pinned environment #4

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
4921788
get costs_{year}.csv instead of costs.csv
danielelerede-oet Sep 27, 2024
1ccc282
get costs_{year}.csv instead of costs.csv
danielelerede-oet Sep 27, 2024
0a88187
remove rule retrieve_cost_data_flexible
danielelerede-oet Oct 3, 2024
634e18b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 3, 2024
f783792
remove rule retrieve_cost_data_flexible
danielelerede-oet Oct 3, 2024
92b3d65
remove rule retrieve_cost_data_flexible
danielelerede-oet Oct 3, 2024
747441f
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Oct 30, 2024
d6afd52
Update PyPSA & enable linopy (#1167)
ekatef Nov 4, 2024
bb95325
Enable linopy - power model (#1169)
ekatef Nov 5, 2024
5c48d60
Get back CI for Windows
ekatef Nov 5, 2024
35517e9
Update environment
ekatef Nov 5, 2024
c71c538
Add H2 carrier if not exists
yerbol-akhmetov Oct 15, 2024
b40e643
Add battery carrier if not exists only
yerbol-akhmetov Oct 15, 2024
fc11c02
use H2 in both AC and DC buses in h2_hc_conversions function
yerbol-akhmetov Oct 22, 2024
38f6090
use AC and DC based H2 to make parameters of m.add consistent shape
yerbol-akhmetov Oct 22, 2024
8c9077e
add release notes
yerbol-akhmetov Oct 30, 2024
5f52c50
docs(contributor): contrib-readme-action has updated readme (#1162)
github-actions[bot] Oct 31, 2024
763fb32
Update PyPSA & enable linopy (#1167)
ekatef Nov 4, 2024
994804a
Enable linopy - power model (#1169)
ekatef Nov 5, 2024
0d3ebdf
Get back CI for Windows
ekatef Nov 5, 2024
34b6168
Update environment
ekatef Nov 5, 2024
268851b
revise implementation to accomodate linopy for sec
GbotemiB Nov 7, 2024
82d9f10
Merge branch 'pypsa_linopy_update' into linopy-sec
GbotemiB Nov 13, 2024
9fcee64
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 13, 2024
ea57cea
Lossy Bidirectional Links
Eric-Nitschke Nov 13, 2024
9acbfe4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 14, 2024
08bd2bd
Update PyPSA version
ekatef Nov 15, 2024
fe025fc
Merge remote-tracking branch 'upstream/main' into pypsa_linopy_update
ekatef Nov 18, 2024
6e892ea
Merge branch 'pypsa_linopy_update' into linopy-sec
GbotemiB Nov 18, 2024
a1f91e4
Update release notes
Eric-Nitschke Nov 18, 2024
31c7973
Merge remote-tracking branch 'origin/main'
Eric-Nitschke Nov 18, 2024
5264e62
Lift a version restriction
ekatef Nov 19, 2024
cedfda8
Enable augmented network
ekatef Nov 19, 2024
f61058a
Add a requirement to update countrycode
ekatef Nov 20, 2024
fdacd80
Merge branch 'pypsa_linopy_update' into linopy-sec
GbotemiB Nov 20, 2024
c5a4764
Use an installation from the source for countrycode
ekatef Nov 20, 2024
acc9431
Remove redundand initialisation
ekatef Nov 20, 2024
04065eb
Switch on extra functionality
ekatef Nov 20, 2024
dc4dba3
Fix grouping in add_res_constraints
ekatef Nov 20, 2024
25a9b55
Add missed import
ekatef Nov 20, 2024
876a5f8
Merge branch 'main' into pypsa_linopy_update
ekatef Nov 20, 2024
b6343e2
Fix refuse aligning dimensions
ekatef Nov 20, 2024
129db46
Improve naming
ekatef Nov 20, 2024
200a954
Merge remote-tracking branch 'upstream/pypsa_linopy_update' into pyps…
ekatef Nov 20, 2024
6770144
Remove outdated n.variables
ekatef Nov 20, 2024
aa92c9a
adjust warning for h2_cap
GbotemiB Nov 21, 2024
1ba8d94
revert wildcards rules
GbotemiB Nov 21, 2024
e909f3d
remove comment for .variables
GbotemiB Nov 21, 2024
b0d9cb7
Merge branch 'pypsa_linopy_update' into linopy-sec
GbotemiB Nov 21, 2024
92c931b
Merge pull request #1182 from GbotemiB/linopy-sec
ekatef Nov 21, 2024
a0c0a05
Spelling fix
Eric-Nitschke Nov 22, 2024
a2150d6
Merge branch 'main' of github.com:pypsa-meets-earth/pypsa-earth
Eric-Nitschke Nov 26, 2024
1a98c9f
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Nov 26, 2024
7f93dd0
Put country-specific data into resources folder
ekatef Dec 10, 2024
26eafdb
Replace a benchmark path
ekatef Dec 10, 2024
f5a957e
Replace path hardcoding in script
ekatef Dec 11, 2024
ac90aec
Revert "docs(contributor): contrib-readme-action has updated readme"
Eric-Nitschke Dec 19, 2024
a3bd91d
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Dec 19, 2024
80aee27
Fix ci (#1210)
davide-f Nov 28, 2024
45fdc2b
Merge branch 'main' of github.com:Eric-Nitschke/pypsa-earth-bidirecti…
Eric-Nitschke Dec 19, 2024
0cd0fb5
Merge branch 'main' into pypsa_linopy_update
ekatef Dec 20, 2024
ffdf4a4
Remove outdated dependency hint
ekatef Dec 20, 2024
95d7a29
Update comments
ekatef Dec 20, 2024
ff939d4
Add a docstring
ekatef Dec 20, 2024
8172112
Update the release notes
ekatef Dec 20, 2024
6ca4177
Update scripts/solve_network.py
ekatef Dec 20, 2024
8b70c7f
Merge branch 'main' into sec_paths
ekatef Dec 20, 2024
2804cac
Merge branch 'main' into costs_year
davide-f Dec 21, 2024
5a33886
Finalize retrieve_data
davide-f Dec 21, 2024
6022316
Minor fixes
davide-f Dec 21, 2024
75b60ca
Merge branch 'main' of https://github.com/pypsa-meets-earth/pypsa-ear…
ekatef Dec 21, 2024
eafc486
Add a workflow to update environments in PR
ekatef Dec 21, 2024
2678af3
Merge branch 'main' into pypsa_linopy_update
ekatef Dec 21, 2024
3ff85e7
[github-actions.ci] Update pinned envs (#1253)
github-actions[bot] Dec 21, 2024
36f45f0
Remove an outdated dependency
ekatef Dec 21, 2024
25f6d73
Remove a redundand workflow
ekatef Dec 21, 2024
cad2731
Merge remote-tracking branch 'upstream/pypsa_linopy_update' into pyps…
ekatef Dec 21, 2024
0f1d8ce
Get back CI for Windows
ekatef Dec 22, 2024
77f557f
git@github.com:pypsa-meets-earth/pypsa-earth.git
davide-f Nov 28, 2024
1d507dc
Merge branch 'main' into pypsa_linopy_update
ekatef Dec 22, 2024
a6674b8
Merge remote-tracking branch 'origin/fix_env' into test_linopy_latest…
davide-f Dec 23, 2024
9dcfd1e
Minor refactoring
ekatef Dec 24, 2024
82e431f
Replace merge functions
ekatef Dec 24, 2024
5a7efce
Merge main into pypsa_linopy_update
ekatef Dec 24, 2024
d6b3659
Add a TODO
ekatef Dec 24, 2024
6a90b66
Merge branch 'main' into sec_paths
ekatef Dec 24, 2024
d566e98
Put the path into snakemake inputs
ekatef Dec 24, 2024
09ec93f
Merge branch 'sec_paths' of https://github.com/ekatef/pypsa-earth int…
ekatef Dec 24, 2024
9c612f0
Merge remote-tracking branch 'upstream/pypsa_linopy_update' into test…
davide-f Dec 24, 2024
c337918
Merge remote-tracking branch 'origin/fix_env' into test_linopy_latest…
davide-f Dec 24, 2024
e4386fc
Fix typo
ekatef Dec 24, 2024
b7f1ffb
Merge pull request #1236 from ekatef/sec_paths
davide-f Dec 24, 2024
e7dd650
Setup environment for release (#1263)
davide-f Dec 24, 2024
e3fc578
Release v0.6.0 (#1264)
ekatef Dec 24, 2024
2ee49f3
Merge pypsa-earth/main into pypsa_linopy_update
ekatef Dec 27, 2024
4b05b02
Update configuration strategies
ekatef Dec 27, 2024
4993f9b
Bump the github-actions group with 2 updates (#1266)
dependabot[bot] Dec 30, 2024
e38b221
Fix bidirectional lossy links
Eric-Nitschke Jan 2, 2025
fefe70b
Constraint implementation bug fixes
Eric-Nitschke Jan 2, 2025
4738a3f
Revert "Merge branch 'main' of github.com:Eric-Nitschke/pypsa-earth-b…
Eric-Nitschke Jan 2, 2025
e108be5
Merge branch 'lossy_length_based'
Eric-Nitschke Jan 2, 2025
c551b82
docs(contributor): contrib-readme-action has updated readme (#1273)
github-actions[bot] Jan 2, 2025
9f55920
Merge remote-tracking branch 'upstream/main'
Eric-Nitschke Jan 2, 2025
2ac8db4
Unify transmission efficiency
Eric-Nitschke Jan 2, 2025
02fc071
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 2, 2025
9d14ac2
Spelling fix
Eric-Nitschke Jan 2, 2025
f6aa253
Merge branch 'main' of github.com:Eric-Nitschke/pypsa-earth-bidirecti…
Eric-Nitschke Jan 2, 2025
ca1db0a
Release notes update
Eric-Nitschke Jan 2, 2025
da1cfab
Merge remote-tracking branch 'upstream/pypsa_linopy_update' into test…
davide-f Jan 2, 2025
d463de7
Unify save_to_geojson definition
davide-f Jan 2, 2025
38ac5ea
Move tsam installation to conda
davide-f Jan 3, 2025
0a09bca
do not compute powerplants from ppm if replace option is used
yerbol-akhmetov Jan 4, 2025
c3a1eb1
Add release notes
yerbol-akhmetov Jan 4, 2025
5b9ac30
Revise export path of unsd data (#1279)
davide-f Jan 4, 2025
c5778dc
Merge branch 'main' into custom_powerplants_fix
davide-f Jan 4, 2025
395aaec
Move release note and drop DateMothball column from custom_powerplants
davide-f Jan 4, 2025
b4e7d56
Merge branch 'main' into test_linopy_latest_gpd
davide-f Jan 4, 2025
a0971d5
Merge pull request #1281 from yerbol-akhmetov/custom_powerplants_fix
davide-f Jan 4, 2025
ef525ee
Use username for contributors (#1282)
davide-f Jan 4, 2025
2c9c29f
Fix overlapping bus regions when alternative clustering is selected
choiHenry Jan 9, 2025
c10d1c8
Merge remote-tracking branch 'origin/main' into retrieve_data
davide-f Jan 9, 2025
1eb3b34
Add code to keep isolated buses when necessary
choiHenry Jan 10, 2025
2b388a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 10, 2025
e32f71c
remove duplicated config entry
doneachh Jan 10, 2025
9479e27
remove duplicated entry in config.test_myopic
doneachh Jan 10, 2025
8c7ec24
Add release note
davide-f Jan 10, 2025
1f79db0
Merge pull request #1287 from choiHenry/AC_drop_overlapping_bus_regions
davide-f Jan 10, 2025
c406a1d
Add release note
davide-f Jan 10, 2025
3723590
Merge pull request #1249 from davide-f/retrieve_data
davide-f Jan 10, 2025
be42f1d
remove duplicated gadm_level
doneachh Jan 13, 2025
7c87a48
Bugfix Snakefile for non-Windows operating systems
Eric-Nitschke Jan 13, 2025
4092176
Merge branch 'main' into main
Eric-Nitschke Jan 13, 2025
fcb9911
Bugfix test config
Eric-Nitschke Jan 13, 2025
007e427
Merge branch 'main' of github.com:Eric-Nitschke/pypsa-earth-bidirecti…
Eric-Nitschke Jan 13, 2025
62cab73
Bugfix readthedocs (#1292)
Eric-Nitschke Jan 13, 2025
f3c0ea7
Merge branch 'main' into main
ekatef Jan 13, 2025
b1ef404
Merge branch 'main' into main
Eric-Nitschke Jan 14, 2025
090eeb9
Final adjustments for bidirectional lossy links
Eric-Nitschke Jan 14, 2025
d84ce66
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
57b40b9
Merge pull request #1288 from doneachh/main
ekatef Jan 14, 2025
8adc703
Merge remote-tracking branch 'upstream/main' into test_linopy_latest_gpd
davide-f Jan 14, 2025
7835858
Add release note
davide-f Jan 14, 2025
60fe1d0
Update the arguments list for a special case
ekatef Jan 6, 2025
eaba5cf
Update Snakefile: Remove os.getcwd from this PR. To be solved in Bugf…
Eddy-JV Jan 15, 2025
83434a0
Merge pull request #1192 from Eric-Nitschke/main
Eddy-JV Jan 15, 2025
44a8966
Update README (#1274)
ekatef Jan 15, 2025
e393855
Bugfix: Fix admin needs for Windows (#1295)
Eric-Nitschke Jan 15, 2025
8344fa2
Merge branch 'main' into test_linopy_latest_gpd
davide-f Jan 15, 2025
0a3cd17
Implement linopy into add_lossy_bidirectional
davide-f Jan 16, 2025
5d3e89a
Fix copy-minimal for windows (#1301)
davide-f Jan 16, 2025
ef734c6
Merge branch 'main' into test_linopy_latest_gpd
davide-f Jan 16, 2025
c44413c
Update stable version in readme
davide-f Jan 16, 2025
731b8dc
Merge pull request #1276 from davide-f/test_linopy_latest_gpd
davide-f Jan 16, 2025
e29386d
[github-actions.ci] Update pinned envs (#1302)
github-actions[bot] Jan 16, 2025
5692063
Switch-off fetching isolated networks as a temporary fix (#1313)
ekatef Jan 20, 2025
67df046
add auto generated citation.cff
Ly0n Jan 21, 2025
9a2797e
add DOI badge
Ly0n Jan 21, 2025
27076db
Add ORCID
Ly0n Jan 21, 2025
d1fc82b
fix bug in badge and add linter note to file
Ly0n Jan 21, 2025
1a6259e
Update CITATION.cff
Ly0n Jan 21, 2025
7d83f35
Align structure of the components with PyPSA consistency checks (#1315)
ekatef Jan 21, 2025
5220051
Add new CITATION.cff to release_notes.rst
Ly0n Jan 22, 2025
fa92f80
Merge branch 'main' into add-CITATION-cff
ekatef Jan 22, 2025
3d31fa1
Merge pull request #1316 from Ly0n/add-CITATION-cff
ekatef Jan 22, 2025
c0bb99d
Replace pyomo with linopy (#1323)
GbotemiB Jan 28, 2025
5199967
Update pinned environment files for all platforms
ekatef Jan 29, 2025
953c3fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- name: Checkout
id: checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.REGISTRY_USER }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ jobs:
contrib-readme-job:
runs-on: ubuntu-latest
name: A job to automate contrib in readme
if: ${{ github.repository_owner == 'pypsa-meets-earth' && github.ref == 'refs/heads/main'}}
if: ${{ github.event_name == 'workflow_dispatch' || (github.repository_owner == 'pypsa-meets-earth' && github.ref == 'refs/heads/main')}}
steps:
- name: Contribute List
uses: akhilmhdh/contributors-readme-action@v2.3.10
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
use_username: true
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
env_file: envs/linux-pinned.yaml
- os: macos
env_file: envs/macos-pinned.yaml
# - os: windows
# env_file: envs/windows-pinned.yaml
- os: windows
env_file: envs/windows-pinned.yaml

defaults:
run:
Expand Down
3 changes: 3 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

version: 2

sphinx:
configuration: doc/conf.py

build:
os: ubuntu-22.04
tools:
Expand Down
43 changes: 43 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
# SPDX-License-Identifier: AGPL-3.0-or-later

title: PyPSA-Earth. A new global open energy system optimization model demonstrated in Africa
abstract: This repository contains the source code of the paper PyPSA-Earth. A new global open energy system optimization model demonstrated in Africa by Maximilian Parzen, Hazem Abdel-Khalek, Ekaterina Fedotova, Matin Mahmood, Martha Maria Frysztacki, Johannes Hampp, Lukas Franken, Leon Schumm, Fabian Neumann, Davide Poli, Aristides Kiprakis and Davide Fioriti, from Applied Energy
doi: 10.1016/j.apenergy.2023.121096
repository-code: https://github.com/pypsa-meets-earth/pypsa-earth
version: 1.0.0
date-released: 2023-04-18
message: If you use this software in your work, please cite it using the following metadata.
authors:
- given-names: Maximilian
family-names: Parzen
orcid: https://orcid.org/0000-0002-4390-0063
- given-names: Hazem
family-names: Abdel-Khalek
- given-names: Ekaterina
family-names: Fedotova
orcid: https://orcid.org/0000-0002-5590-9591
- given-names: Matin
family-names: Mahmood
- given-names: Martha Maria
family-names: Frysztacki
orcid: https://orcid.org/0000-0002-0788-1328
- given-names: Johannes
family-names: Hampp
orcid: https://orcid.org/0000-0002-1776-116X
- given-names: Lukas
family-names: Franken
- given-names: Leon
family-names: Schumm
- given-names: Fabian
family-names: Neumann
orcid: https://orcid.org/0000-0002-6604-5450
- given-names: Davide
family-names: Poli
orcid: https://orcid.org/0000-0002-5045-9034
- given-names: Aristides
family-names: Kiprakis
- given-names: Davide
family-names: Fioriti
orcid: https://orcid.org/0000-0001-5491-7912
cff-version: 1.2.0
Loading