From 77b29ab1e1b6b713a44d0207073456c9d2b8cd6a Mon Sep 17 00:00:00 2001 From: TANG ZHIXIONG Date: Thu, 30 Nov 2023 00:10:38 +0800 Subject: [PATCH] fix CI --- .github/workflows/wheels.yml | 2 +- data/Makefile | 8 ++++---- tests/test_basic.py | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 0b2ad74..f1a584f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -54,7 +54,7 @@ jobs: env: CIBW_ARCHS_MACOS: universal2 CIBW_ARCHS_WINDOWS: auto ARM64 - CIBW_BEFORE_BUILD: pip install fire loguru numpy --prefer-binary + CIBW_BEFORE_BUILD: pip install fire loguru numpy --prefer-binary && make pull_data # https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip CIBW_SKIP: pp* *i686 *musllinux* CIBW_TEST_SKIP: "*macosx* *-win_arm64" diff --git a/data/Makefile b/data/Makefile index 6ddd88c..156dec4 100644 --- a/data/Makefile +++ b/data/Makefile @@ -14,13 +14,13 @@ clean: # https://github.com/cubao/fmm/wiki/Sample-data pull: network.json -network.json: network.zip - unzip $< +network.json: | network.zip + unzip network.zip network.zip: curl -LO https://github.com/cubao/fmm/files/11698908/network.zip pull: suzhoubeizhan.json -suzhoubeizhan.json: suzhoubeizhan.zip - unzip $< +suzhoubeizhan.json: | suzhoubeizhan.zip + unzip suzhoubeizhan.zip suzhoubeizhan.zip: curl -LO https://github.com/cubao/fmm/files/12568463/suzhoubeizhan.zip diff --git a/tests/test_basic.py b/tests/test_basic.py index 6c1a3a7..498fa99 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -590,7 +590,7 @@ def test_indexer(): def test_network_read_write(): - network = Network.load("README.md") + network = Network.load(f"{__PWD}/README.md") assert network is None network = Network.load("missing_file") assert network is None @@ -618,7 +618,10 @@ def test_network_read_write(): def test_network_query(): - network = Network.load(f"{__BUILD}/network.geojson") + path = f"{__BUILD}/network.geojson" + if not os.path.isfile(path): # noqa: PTH113 + test_network_read_write() + network = Network.load(path) assert network.is_wgs84() assert len(network.roads()) == 1016 assert network.next_roads(1293) == {1297, 1298}