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

Os to pathlib and helpers.py method from pypsa-earth-sec #2

Merged
merged 25 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3f9a5b7
_helpers.py os to pathlib
finozzifa Jun 4, 2024
a3b8022
os to pathlib for add_electricity, add_extra_components, augmented_li…
finozzifa Jun 5, 2024
8c11895
re-formatting
finozzifa Jun 5, 2024
04378db
os to pathlib build_shapes.py, build_test_configs.py, clean_osm_data.…
finozzifa Jun 5, 2024
16e6c46
os to pathlib make_summary.py, monte_carlo.py, non_workflow/zip_folde…
finozzifa Jun 5, 2024
56911ff
add unit test setup
finozzifa Jun 5, 2024
75d27a5
reformatting
finozzifa Jun 5, 2024
0c9dd21
change to _helpers.py methods
finozzifa Jun 5, 2024
c64be54
add new unit test for build_directory
finozzifa Jun 5, 2024
d6f7d99
modify unit test build_directory
finozzifa Jun 6, 2024
2fdd90e
comment out test_prepare_network
finozzifa Jun 6, 2024
1498ce4
add ci-unit-test.yaml
finozzifa Jun 6, 2024
b5158f8
modify ci-unit-test.yaml
finozzifa Jun 6, 2024
a3bf6cc
remove match statement from monte_carlo.py
finozzifa Jun 6, 2024
6590496
Merge branch 'main' of https://github.com/open-energy-transition/pyps…
finozzifa Jun 6, 2024
3971b02
add unit tests at the end of current workflows
finozzifa Jun 6, 2024
c059a3a
add os.sep in test_helpers.py
finozzifa Jun 6, 2024
52b4d4c
from scripts
finozzifa Jun 7, 2024
bae5586
Update configs - Anton (#1037)
davide-f Jun 7, 2024
d8430b0
move load_network_for_plots to plot_network
finozzifa Jun 7, 2024
547eae0
Merge branch 'main' of https://github.com/open-energy-transition/pyps…
finozzifa Jun 7, 2024
451f569
main to oet_main in workflow files
finozzifa Jun 7, 2024
7a71537
modify Snakefile
finozzifa Jun 7, 2024
b522879
remove .scripts/
finozzifa Jun 7, 2024
e2abe30
remove some abstractions
finozzifa Jun 7, 2024
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
5 changes: 5 additions & 0 deletions .github/workflows/ci-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ jobs:
cp test/tmp/config.landlock_tmp.yaml config.yaml
snakemake --cores all solve_all_networks --forceall

- name: Unit tests
run: |
python -m pip install pytest
pytest test/

# - name: Test plotting and summaries
# run: |
# snakemake --cores all plot_all_p_nom
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci-mac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ jobs:
cp test/tmp/config.tutorial_noprogress_tmp.yaml config.yaml
snakemake --cores all solve_all_networks

- name: Unit tests
run: |
python -m pip install pytest
pytest test/

# - name: Test plotting and summaries
# run: |
# snakemake --cores all plot_all_p_nom
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ jobs:
cp test/tmp/config.tutorial_noprogress_tmp.yaml config.yaml
snakemake --cores all solve_all_networks

- name: Unit tests
run: |
python -m pip install pytest
pytest test/

# - name: Test plotting and summaries
# run: |
# snakemake --cores all plot_all_p_nom
Expand Down
2 changes: 1 addition & 1 deletion Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sys

sys.path.append("./scripts")

from os.path import normpath, exists, isdir
from os.path import normpath, exists
from shutil import copyfile, move

from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider
Expand Down
6 changes: 3 additions & 3 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
# -- Path setup --------------------------------------------------------------
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
# documentation root, use pathlib.Path.absolute to make it absolute, like shown here.
#
import datetime
import os
import pathlib
import shutil
import sys

from git import Repo

sys.path.insert(0, os.path.abspath("../scripts"))
sys.path.insert(0, str(pathlib.Path("../scripts").absolute()))
for p in sys.path:
print(p)

Expand Down
Loading
Loading