Skip to content

Commit

Permalink
chore(CI/CD): bump version 0.12.0 -> 0.12.1 (#185)
Browse files Browse the repository at this point in the history
* chore(CI/CD): bump version 0.12.0 -> 0.12.1

* docs: update CHANGELOG.md

* ci: change uv installation script

* ci: force terminal mode in tests

* test: add debug print

* ci: remove force terminal mode from tests

* ci: remove debug print

* ci: lock fiona version

* ci: change fiona installation

* ci: add geocoding cache for nominatim

---------

Co-authored-by: Kamil Raczycki <[email protected]>
  • Loading branch information
kraina-cicd and RaczeQ authored Jan 3, 2025
1 parent 8a0e9e2 commit d9e8d54
Show file tree
Hide file tree
Showing 26 changed files with 47 additions and 11 deletions.
1 change: 0 additions & 1 deletion .github/workflows/_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
COLUMNS: 120
FORCE_TERMINAL_MODE: true
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/manual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
COLUMNS: 120
FORCE_TERMINAL_MODE: true
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
Expand All @@ -38,8 +37,7 @@ jobs:
run: pdm export -dG test -f requirements -o requirements.test.txt
- name: Install quackosm
run: |
pdm build -v -d dist
uv pip install 'quackosm[cli] @ file://'"$(pwd)/$(find dist -name '*.whl')" -r requirements.test.txt --system
uv pip install -e "quackosm[cli] @ ." -r requirements.test.txt --system
- name: Run tests with pytest
run: |
pytest -v -s --durations=20 --doctest-modules --doctest-continue-on-failure quackosm
Expand All @@ -58,7 +56,6 @@ jobs:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
COLUMNS: 120
FORCE_TERMINAL_MODE: true
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
Expand All @@ -68,7 +65,9 @@ jobs:
- name: Install pdm
run: pip install pdm
- name: Generate lock with oldest dependencies
run: pdm lock --lockfile pdm.oldest.lock --strategy no_cross_platform,direct_minimal_versions -G cli -dG test
run: |
echo "fiona==1.9.6" >> fiona_constraint.txt
pdm lock --override fiona_constraint.txt --lockfile pdm.oldest.lock --strategy no_cross_platform,direct_minimal_versions -G cli -dG test
- name: Install quackosm and tests dependencies
run: pdm install --lockfile pdm.oldest.lock -G cli -dG test --skip=post_install
- name: Run tests with pytest
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.12.1] - 2025-01-03

### Added

- Automatic download progress bar hiding when verbosity is set to `silent`.
Expand Down Expand Up @@ -425,7 +427,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Created QuackOSM repository
- Implemented PbfFileReader

[Unreleased]: https://github.com/kraina-ai/quackosm/compare/0.12.0...HEAD
[Unreleased]: https://github.com/kraina-ai/quackosm/compare/0.12.1...HEAD

[0.12.1]: https://github.com/kraina-ai/quackosm/compare/0.12.0...0.12.1

[0.12.0]: https://github.com/kraina-ai/quackosm/compare/0.11.4...0.12.0

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "QuackOSM"
version = "0.12.0"
version = "0.12.1"
description = "An open-source tool for reading OpenStreetMap PBF files using DuckDB"
authors = [{ name = "Kamil Raczycki", email = "[email protected]" }]
dependencies = [
Expand Down Expand Up @@ -173,7 +173,7 @@ close-quotes-on-newline = true
wrap-one-line = true

[tool.bumpver]
current_version = "0.12.0"
current_version = "0.12.1"
version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
commit_message = "chore(CI/CD): bump version {old_version} -> {new_version}"
commit = true
Expand Down
2 changes: 1 addition & 1 deletion quackosm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from quackosm.pbf_file_reader import PbfFileReader

__app_name__ = "QuackOSM"
__version__ = "0.12.0"
__version__ = "0.12.1"

__all__ = [
"PbfFileReader",
Expand Down
2 changes: 1 addition & 1 deletion tests/base/test_geocoding.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[
"Vatican",
"Monaco",
"Poland",
"Dolnośląskie",
["United Kingdom", "Greater London"],
["Madrid", "Barcelona", "Seville"],
],
Expand Down
15 changes: 15 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
"""Global conftest for QuackOSM tests."""

import os
import shutil
from pathlib import Path

import pytest
from pytest import Item


def pytest_runtest_setup(item: Item) -> None:
"""Setup python encoding before `pytest_runtest_call(item)`."""
os.environ["PYTHONIOENCODING"] = "utf-8"


@pytest.fixture(autouse=True, scope="session") # type: ignore
def copy_geocode_cache() -> None:
"""Load cached geocoding results."""
existing_cache_directory = Path(__file__).parent / "test_files" / "geocoding_cache"
geocoding_cache_directory = Path("cache")
geocoding_cache_directory.mkdir(exist_ok=True)
for file_path in existing_cache_directory.glob("*.json"):
destination_path = geocoding_cache_directory / file_path.name
shutil.copy(file_path, destination_path)

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type": "Polygon", "coordinates": [[[7.4175019, 43.731467], [7.4179599, 43.7311633], [7.4180943, 43.7312241], [7.41849, 43.7309224], [7.4185156, 43.7309401], [7.4185527, 43.730912], [7.4185849, 43.7309319], [7.4186263, 43.7309041], [7.4186843, 43.7309436], [7.4188242, 43.730896], [7.418907, 43.7309103], [7.4189949, 43.7308879], [7.4190141, 43.7308475], [7.4191537, 43.730811], [7.4192025, 43.7308324], [7.4192828, 43.7308119], [7.4193157, 43.7307817], [7.4193883, 43.7307492], [7.4194618, 43.7307693], [7.4195425, 43.7307044], [7.4196805, 43.7305599], [7.4197973, 43.7305311], [7.4198861, 43.7304272], [7.419973, 43.7302557], [7.4200315, 43.7302618], [7.4200805, 43.7302126], [7.4200963, 43.7300965], [7.4202284, 43.7300034], [7.4203453, 43.7298846], [7.4205009, 43.7298639], [7.4206802, 43.7299077], [7.4207735, 43.7298949], [7.4208486, 43.7300022], [7.4209221, 43.7299903], [7.4209679, 43.7300723], [7.4210518, 43.73009], [7.4210877, 43.7301068], [7.4211411, 43.7300921], [7.4211422, 43.7301352], [7.4211468, 43.730165], [7.4212435, 43.730219], [7.4214974, 43.7301807], [7.4215336, 43.7301628], [7.4215876, 43.7301345], [7.4216446, 43.7300926], [7.4216833, 43.7300888], [7.4217438, 43.7300659], [7.4217694, 43.7299955], [7.4218057, 43.7298531], [7.4217607, 43.7298067], [7.4217569, 43.7297009], [7.4218046, 43.7296714], [7.4219232, 43.7296554], [7.4219882, 43.729558], [7.422219, 43.7294394], [7.4223279, 43.7295249], [7.4224433, 43.7295363], [7.4225894, 43.7294871], [7.4228046, 43.7294114], [7.4228726, 43.7294022], [7.4228801, 43.7293901], [7.4230093, 43.7293977], [7.4230183, 43.7293894], [7.4230799, 43.7293865], [7.4231003, 43.729391], [7.4231123, 43.7293983], [7.4231625, 43.7293969], [7.4231811, 43.7294032], [7.4232125, 43.7294063], [7.4231941, 43.7293903], [7.423202, 43.7293845], [7.4232281, 43.7293993], [7.423247, 43.7294038], [7.4232858, 43.7293987], [7.4233022, 43.7294045], [7.4233204, 43.7294057], [7.4233559, 43.7293944], [7.4233711, 43.7293998], [7.4233858, 43.7293982], [7.4233895, 43.7293761], [7.4234021, 43.7293638], [7.4234288, 43.7293621], [7.4234604, 43.7293696], [7.4234872, 43.7293856], [7.4235069, 43.7293849], [7.4235318, 43.7293881], [7.4235715, 43.7294032], [7.4236049, 43.7294101], [7.4236258, 43.7294054], [7.4236382, 43.7294081], [7.4236606, 43.7294061], [7.4236747, 43.7294115], [7.4236907, 43.7294097], [7.4238398, 43.7294118], [7.4238679, 43.7294064], [7.4239039, 43.7294071], [7.4239495, 43.7293767], [7.4239957, 43.7293686], [7.4240093, 43.7293675], [7.4240183, 43.7293758], [7.4240347, 43.7293979], [7.4240663, 43.7294073], [7.4241375, 43.7294177], [7.4241866, 43.7294134], [7.4242381, 43.7294197], [7.4242993, 43.7294609], [7.4243274, 43.729494], [7.4243443, 43.7295311], [7.4244198, 43.7295926], [7.4244825, 43.7296643], [7.424561, 43.7297275], [7.4246171, 43.7297787], [7.4247193, 43.7297705], [7.4247967, 43.7298055], [7.4248813, 43.7298063], [7.4249587, 43.7298083], [7.4249999, 43.7298462], [7.4250005, 43.729916], [7.4250179, 43.7300408], [7.4251764, 43.7301153], [7.4252608, 43.7302033], [7.425416, 43.7302985], [7.4255315, 43.7303342], [7.4256469, 43.7304107], [7.4258878, 43.7304639], [7.4259249, 43.7305068], [7.4259679, 43.7306431], [7.4260226, 43.7306868], [7.4261593, 43.7306938], [7.4262478, 43.730653], [7.4263058, 43.7305999], [7.4264791, 43.7305654], [7.4266342, 43.7305323], [7.4267615, 43.7305262], [7.4268442, 43.7305617], [7.4272595, 43.7308804], [7.427495, 43.7311058], [7.4276559, 43.7312481], [7.4276204, 43.731396], [7.4276927, 43.7316425], [7.4277458, 43.7316707], [7.4277697, 43.7316671], [7.4278413, 43.7317079], [7.4278377, 43.731734], [7.427824, 43.7317548], [7.4278274, 43.7318043], [7.4279925, 43.7319343], [7.428056, 43.7320136], [7.4280647, 43.7320354], [7.4280956, 43.7320577], [7.4281835, 43.7320833], [7.4282376, 43.7320846], [7.4282764, 43.7320775], [7.4283095, 43.7320876], [7.4283047, 43.732102], [7.4282573, 43.7321101], [7.4282294, 43.7321266], [7.4282137, 43.7321581], [7.4282369, 43.7321874], [7.4282215, 43.7322119], [7.4281713, 43.7322233], [7.4281623, 43.7322603], [7.4281769, 43.7322791], [7.4282374, 43.7323284], [7.4282294, 43.7323392], [7.4281716, 43.7323719], [7.428178, 43.7324415], [7.4282195, 43.7324857], [7.4282603, 43.7328137], [7.4277231, 43.7329715], [7.4276947, 43.7329804], [7.4275506, 43.7329977], [7.4273553, 43.7329696], [7.4259768, 43.7326576], [7.4254943, 43.7325541], [7.4245897, 43.7323501], [7.4243228, 43.7322943], [7.4242626, 43.7322859], [7.4240439, 43.7322555], [7.4236791, 43.7322633], [7.4234109, 43.7322633], [7.4228153, 43.7321967], [7.4226785, 43.7321826], [7.4223791, 43.7321425], [7.4222714, 43.7321316], [7.4221642, 43.7321179], [7.4220576, 43.7321018], [7.4219918, 43.7320869], [7.4219435, 43.7320768], [7.4218383, 43.7320553], [7.4217547, 43.7320465], [7.4216703, 43.7320447], [7.4215655, 43.7320484], [7.4214613, 43.7320579], [7.4212208, 43.7320944], [7.421122, 43.7321306], [7.4206917, 43.7321936], [7.4203828, 43.7322344], [7.4203389, 43.7322395], [7.4200957, 43.7322785], [7.4199487, 43.7323019], [7.4199089, 43.7323157], [7.4198759, 43.732337], [7.4198284, 43.7323603], [7.4197729, 43.732385], [7.4197171, 43.7323987], [7.4195343, 43.7324209], [7.4190111, 43.7324998], [7.4184229, 43.7320866], [7.4175439, 43.7317938], [7.4175186, 43.7315738], [7.4175019, 43.731467]]]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"place_id": 73404766, "licence": "Data \u00a9 OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright", "osm_type": "relation", "osm_id": 36989, "lat": "41.903411", "lon": "12.4528527", "class": "boundary", "type": "administrative", "place_rank": 4, "importance": 0.7249570489177176, "addresstype": "country", "name": "Vatican City", "display_name": "Vatican City", "boundingbox": ["41.9002044", "41.9073829", "12.4457878", "12.4583653"], "geojson": {"type": "Polygon", "coordinates": [[[12.4457878, 41.9019669], [12.4465013, 41.9016602], [12.4465468, 41.9016406], [12.4467233, 41.9017975], [12.4473425, 41.9014028], [12.4473346, 41.9013963], [12.4473874, 41.9013627], [12.4474403, 41.9013292], [12.4474486, 41.9013362], [12.4479728, 41.901002], [12.4479414, 41.9009743], [12.447935, 41.9009781], [12.4477919, 41.9008499], [12.4479497, 41.9006923], [12.448127, 41.900719], [12.448775, 41.9008166], [12.4487752, 41.9009986], [12.4508676, 41.900827], [12.4508651, 41.9008147], [12.4508789, 41.9008134], [12.4508389, 41.9005862], [12.4510337, 41.9005398], [12.4511333, 41.9005162], [12.451153, 41.9005115], [12.4511812, 41.9005048], [12.4512105, 41.9004978], [12.4512814, 41.900481], [12.4514229, 41.9004473], [12.451557, 41.9004154], [12.4518065, 41.9003561], [12.4520924, 41.9003296], [12.4522215, 41.9003213], [12.4525599, 41.9002996], [12.452791, 41.9002848], [12.452806, 41.9003709], [12.4528313, 41.9004914], [12.4528837, 41.9004825], [12.4531493, 41.9004382], [12.4533796, 41.9003996], [12.4537685, 41.9003344], [12.4538798, 41.9003158], [12.4538853, 41.9003061], [12.4539906, 41.9002909], [12.4542374, 41.9002498], [12.4545153, 41.9002044], [12.4545808, 41.900344], [12.4545788, 41.9003896], [12.4545736, 41.9004128], [12.4544963, 41.9004128], [12.454486, 41.9005919], [12.4543854, 41.9005892], [12.4543803, 41.9007108], [12.4543462, 41.9007108], [12.4543392, 41.9009442], [12.4543254, 41.901403], [12.4543893, 41.901403], [12.4544177, 41.9014196], [12.4544179, 41.9014366], [12.4548151, 41.9014329], [12.4548118, 41.9014707], [12.4548115, 41.9015021], [12.4552396, 41.9015525], [12.4561518, 41.9016599], [12.456198, 41.9016652], [12.4562631, 41.9016731], [12.4562811, 41.9016406], [12.4563144, 41.9016414], [12.4563688, 41.9015733], [12.4563796, 41.901559], [12.456401, 41.9015304], [12.4564185, 41.9015114], [12.4564371, 41.9014911], [12.456474, 41.9014513], [12.4565175, 41.9014131], [12.4565728, 41.9013704], [12.4566443, 41.901326], [12.4566514, 41.9013216], [12.4566705, 41.9013103], [12.4566929, 41.9012987], [12.4567202, 41.9012859], [12.456778, 41.9012596], [12.4568414, 41.9012382], [12.4568894, 41.9012211], [12.4569597, 41.9012027], [12.4570257, 41.9011887], [12.457093, 41.9011783], [12.457147, 41.9011721], [12.4572077, 41.9011684], [12.4572289, 41.9011682], [12.4573773, 41.901167], [12.4574568, 41.9011768], [12.4575143, 41.9011861], [12.4575859, 41.9012011], [12.4576476, 41.9012159], [12.4577105, 41.9012354], [12.4577619, 41.9012553], [12.4578176, 41.9012812], [12.4578735, 41.9013072], [12.4579259, 41.9013363], [12.4579769, 41.9013663], [12.4580261, 41.9014062], [12.458077, 41.9014504], [12.4581143, 41.9014866], [12.4581606, 41.9015333], [12.4582187, 41.9016058], [12.4582502, 41.9016639], [12.4582759, 41.9016569], [12.4582972, 41.9017007], [12.4583122, 41.9017313], [12.4583173, 41.9017414], [12.4583038, 41.9017452], [12.4582955, 41.9017476], [12.4582986, 41.9017539], [12.4583038, 41.9017642], [12.4582902, 41.9017678], [12.4582637, 41.901775], [12.4582761, 41.9017983], [12.4582921, 41.9018415], [12.4583088, 41.9018745], [12.4583265, 41.9019228], [12.4583444, 41.9019924], [12.4583573, 41.9020788], [12.4583629, 41.902174], [12.4583653, 41.9022574], [12.4583564, 41.9023649], [12.458332, 41.9024876], [12.4583071, 41.9025689], [12.4582757, 41.9026448], [12.4582547, 41.9026902], [12.4582325, 41.9027251], [12.4582108, 41.9027585], [12.4582309, 41.9027651], [12.4582213, 41.9027813], [12.4582426, 41.9027882], [12.4581939, 41.9028709], [12.4581699, 41.9028631], [12.4581485, 41.9028997], [12.4581149, 41.9029431], [12.458083, 41.9029825], [12.4580326, 41.9030264], [12.4579884, 41.90306], [12.4579382, 41.9030917], [12.4578843, 41.9031269], [12.4578348, 41.9031575], [12.457779, 41.9031811], [12.457714, 41.9032066], [12.457616, 41.9032361], [12.4575538, 41.903253], [12.4575287, 41.9032587], [12.4574742, 41.9032687], [12.4574124, 41.9032781], [12.4573392, 41.9032857], [12.4572347, 41.9032886], [12.4571248, 41.9032842], [12.4570497, 41.9032741], [12.4569956, 41.9032638], [12.4569361, 41.9032513], [12.4568776, 41.9032338], [12.4568135, 41.9032114], [12.4567462, 41.9031888], [12.4566942, 41.9031617], [12.45664, 41.9031355], [12.4565932, 41.9031044], [12.4565435, 41.9030714], [12.4564953, 41.9030351], [12.4564552, 41.9029999], [12.4564212, 41.9029686], [12.4563883, 41.9029308], [12.4563573, 41.902883], [12.4563256, 41.9028396], [12.456302, 41.9027875], [12.4562797, 41.9027931], [12.4562552, 41.9027902], [12.4562397, 41.9027779], [12.4562365, 41.9027551], [12.4561843, 41.9027564], [12.4563348, 41.9030091], [12.4563812, 41.9029887], [12.4565334, 41.9031188], [12.4565944, 41.9031563], [12.4566816, 41.9032032], [12.4568009, 41.9032501], [12.4569224, 41.9032818], [12.457078, 41.9033509], [12.4571884, 41.903325], [12.4571962, 41.9033435], [12.4572765, 41.9033248], [12.4572944, 41.9033471], [12.457386, 41.903342], [12.4574708, 41.9033373], [12.4575579, 41.9033324], [12.457559, 41.9033598], [12.4575815, 41.9039251], [12.4575832, 41.9039676], [12.4575849, 41.9040122], [12.4575967, 41.9043083], [12.4575996, 41.9043798], [12.4576025, 41.9044528], [12.4576244, 41.9050046], [12.4576384, 41.9053563], [12.4576497, 41.9056398], [12.4576569, 41.9058208], [12.4573207, 41.9059042], [12.4571801, 41.9059385], [12.4570217, 41.9059772], [12.4568794, 41.9060119], [12.4567678, 41.9060391], [12.4566408, 41.9060701], [12.4564965, 41.9061053], [12.4556582, 41.9062965], [12.4554001, 41.9073829], [12.4551327, 41.9073159], [12.4549229, 41.9072632], [12.4543805, 41.9071272], [12.4542466, 41.9070937], [12.4539308, 41.9070125], [12.4538672, 41.9069936], [12.4538682, 41.9069904], [12.453829, 41.9069806], [12.4538569, 41.9068876], [12.453883, 41.9068006], [12.4535013, 41.9067351], [12.4531458, 41.9066742], [12.453134, 41.9067151], [12.4526334, 41.9066803], [12.4520606, 41.906528], [12.4520743, 41.906485], [12.4514347, 41.9063716], [12.4513711, 41.9065751], [12.4509145, 41.9065324], [12.4509161, 41.9065221], [12.4505145, 41.9064855], [12.4503233, 41.9059883], [12.4505185, 41.9058394], [12.4494506, 41.9050402], [12.4492722, 41.9051795], [12.4489405, 41.9050442], [12.4488888, 41.9047274], [12.4491049, 41.9046784], [12.4489439, 41.9043451], [12.4488442, 41.904109], [12.4486477, 41.9036102], [12.4483873, 41.9037046], [12.4479072, 41.9034179], [12.4478044, 41.9033354], [12.4477887, 41.9033228], [12.4476422, 41.9031239], [12.4478558, 41.9029913], [12.4468736, 41.9021876], [12.4466245, 41.9023518], [12.4457878, 41.9019669]]]}}, {"place_id": 73599399, "licence": "Data \u00a9 OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright", "osm_type": "node", "osm_id": 424311883, "lat": "41.9034912", "lon": "12.4528349", "class": "place", "type": "suburb", "place_rank": 18, "importance": 0.7249570489177176, "addresstype": "suburb", "name": "Vatican City", "display_name": "Vatican City, 00120, Vatican City", "boundingbox": ["41.8834912", "41.9234912", "12.4328349", "12.4728349"], "geojson": {"type": "Point", "coordinates": [12.4528349, 41.9034912]}}]

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit d9e8d54

Please sign in to comment.