Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
district10 committed Nov 29, 2023
1 parent 17e4628 commit 77b29ab
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions data/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 77b29ab

Please sign in to comment.