Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
d55523e
fix: add check for missing/invalid args in project
AngRodrigues Dec 17, 2024
596ddb3
chore: add mention to issue
AngRodrigues Dec 17, 2024
3345bbe
chore: clear warnings
AngRodrigues Jan 7, 2025
b1a94bd
chore: make warnings clear
AngRodrigues Jan 7, 2025
1bb6e47
chore: make warnings clear
AngRodrigues Jan 7, 2025
27ea51d
tests: bypass the necessary dataset requirement
AngRodrigues Jan 7, 2025
c9da10d
fix: skip required file checks if using loop server data
AngRodrigues Jan 7, 2025
713abff
fix: make the config check through project
AngRodrigues Jan 7, 2025
b52d540
tests: add tests for config checks
AngRodrigues Jan 7, 2025
6322872
style: style fixes by ruff and autoformatting by black
AngRodrigues Jan 7, 2025
554ed6a
fiz: actually use libmamba on build
AngRodrigues Jan 7, 2025
f9752b2
revert previous commit
AngRodrigues Jan 7, 2025
9be3ac6
fix: add init commit
AngRodrigues Jan 8, 2025
29466fe
style: style fixes by ruff and autoformatting by black
AngRodrigues Jan 8, 2025
848f31c
tests: add tests for data_checks for each datatype
AngRodrigues Jan 8, 2025
0257a55
Merge branch 'fix/add_data_checks' of https://github.com/Loop3D/map2l…
AngRodrigues Jan 8, 2025
c68ce9a
fix: actually abort the process if validation fails
AngRodrigues Jan 8, 2025
b9663d6
Merge branch 'fix--162' of https://github.com/Loop3D/map2loop into fi…
AngRodrigues Jan 8, 2025
06ff551
fix: add config check step to project
AngRodrigues Jan 8, 2025
6529bf8
fix: add extra checks for config dictionary
AngRodrigues Jan 8, 2025
ce44489
tests: add config test and reorganise
AngRodrigues Jan 8, 2025
0a85eac
fix: add data checks for fold data and update tests accordingly
AngRodrigues Jan 8, 2025
9eb8fed
Merge branch 'master' of https://github.com/Loop3D/map2loop into fix/…
AngRodrigues Jan 13, 2025
273b82d
typos from merging
AngRodrigues Jan 13, 2025
04b43f1
chore: another typo
AngRodrigues Jan 13, 2025
fc2e393
fix: remove kwargs from project
AngRodrigues Jan 13, 2025
e919f94
chore: refactor geometry checks
AngRodrigues Jan 13, 2025
0002262
chore: update tests for geometry refactor
AngRodrigues Jan 13, 2025
b066a22
chore: refactor id checks
AngRodrigues Jan 14, 2025
141c39f
Merge branch 'master' of https://github.com/Loop3D/map2loop into fix/…
AngRodrigues Jan 14, 2025
9001a08
chore: refactor mandatory fields for str and geo
AngRodrigues Jan 14, 2025
652281c
finalise refactor
AngRodrigues Jan 14, 2025
d1f67a9
chore: finalise details
AngRodrigues Jan 14, 2025
1c42d2e
docs: comment typo
lachlangrose Jan 20, 2025
4e2e799
fix: accept pathlib.Path for save_path
rabii-chaarani Apr 23, 2025
ff23f45
fix: allow str and pathlib.Path
lachlangrose May 1, 2025
628040d
Merge pull request #186 from Loop3D/fix/mapdata_save
lachlangrose May 1, 2025
93fcbd0
add test cases as examples
lachlangrose May 1, 2025
6d0143a
make valid
lachlangrose May 1, 2025
84a1ec2
add warning back as info
lachlangrose May 1, 2025
ae6bf3d
making messages less repetitive
lachlangrose May 1, 2025
406b994
style: style fixes by ruff and autoformatting by black
lachlangrose May 1, 2025
7082b7f
Merge branch 'master' into fix/add_data_checks
lachlangrose May 1, 2025
99fa9da
tests: updating tests after adding geometry validation
lachlangrose May 1, 2025
da9ff10
Merge branch 'fix/add_data_checks' of github.com:Loop3D/map2loop into…
lachlangrose May 1, 2025
85687d3
missed fold
lachlangrose May 1, 2025
f629b2d
fix: remove duplicate functions
lachlangrose May 2, 2025
743a5db
Merge pull request #179 from Loop3D/fix/add_data_checks
lachlangrose May 2, 2025
d05eb4f
trigger re-run
noellehmcheng May 31, 2025
8ac9188
python version 3.12
noellehmcheng May 31, 2025
ba1af1f
change yml
noellehmcheng May 31, 2025
a3445ca
change yml
noellehmcheng May 31, 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
32 changes: 25 additions & 7 deletions .github/workflows/linting_and_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -25,25 +29,39 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.12'
- name: Install GDAL
run: |
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
sudo apt-get update
sudo apt-get install -y libgdal-dev gdal-bin

- name: Set up Miniconda
uses: conda-incubator/setup-miniconda@v2
with:
python-version: '3.12'
miniforge-version: latest
activate-environment: test-env
use-mamba: true
auto-activate-base: false

- name: Install dependencies
shell: bash -l {0}
run: |
conda update -n base -c defaults conda -y
conda install -n base conda-libmamba-solver -c conda-forge -y
conda install -c conda-forge gdal -y
conda install -c conda-forge -c loop3d --file dependencies.txt -y
conda install pytest -y
mamba install python=3.12 -y
mamba install -c conda-forge gdal geopandas shapely networkx owslib beartype pytest scikit-learn -y
pip install map2model loopprojectfile==0.2.2

- name: Install map2loop
shell: bash -l {0}
run: |
python -m pip install .

- name: Run tests
shell: bash -l {0}
run: |
pytest

python -c "import map2model" || echo "map2model not available, tests will use fallback mode"
pytest -v
Loading
Loading