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.

Sign up for GitHub

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

[pull] master from OSGeo:master #104

Merged
merged 4 commits into from
Dec 4, 2024
Merged

[pull] master from OSGeo:master #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbd70c1
autotest: put autotest/gdrivers/data/esric/Layers/ in a .tar to avoid…
rouault Dec 3, 2024
93983c1
CI s390x: Try to avoid annoying warnings of OSSF ScoreCard about unpi…
rouault Dec 4, 2024
a5d0388
.github/workflows/s390x/Dockerfile.ci: unbreak
rouault Dec 4, 2024
7807597
fix previous commit
rouault Dec 4, 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
2 changes: 1 addition & 1 deletion .github/workflows/s390x/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ RUN apt-get update && \
zip

COPY requirements.txt /tmp/
RUN python3 -m pip install -U --break-system-packages -r /tmp/requirements.txt
RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -U --break-system-packages -r /tmp/requirements.txt
Binary file renamed ...c/Layers/_alllayers/L01/R0000C0000.bundle → autotest/gdrivers/data/esric/Layers.tar
View file
Open in desktop
Binary file not shown.
7 changes: 0 additions & 7 deletions autotest/gdrivers/data/esric/Layers/conf.cdi
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions autotest/gdrivers/data/esric/Layers/conf.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion autotest/gdrivers/esric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@pytest.fixture()
def esric_ds():

ds = gdal.Open("data/esric/Layers/conf.xml")
ds = gdal.Open("/vsitar/data/esric/Layers.tar/Layers/conf.xml")
assert ds is not None, "open failed"

return ds
Expand Down
Loading