Skip to content

Commit

Permalink
Try again with apt-get but without PROJ_DATA and PROJ_LIB
Browse files Browse the repository at this point in the history
  • Loading branch information
adrien-berchet committed Oct 31, 2024
1 parent a0b5605 commit 3679290
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 29 deletions.
33 changes: 9 additions & 24 deletions .github/workflows/test_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,16 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4

# Setup Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version.flag }}

# Install MariaDB
- name: Install MariaDB
- name: Install MariaDB and SpatiaLite
run: |
sudo apt-get install -y mariadb-server mariadb-client
# Setup Conda for Python and Pypy
- name: Install Conda environment with Micromamba
uses: mamba-org/setup-micromamba@v2
with:
environment-name: test_${{ matrix.python-version.flag }}
cache-environment: false
create-args: >-
${{ matrix.python-version.pkg_name }}
libgdal
libspatialite==5.0.1
numpy<2
pyproj<=3.6.0
rasterio<=1.3.8
condarc: |
channels:
- conda-forge
- defaults
channel_priority: strict
sudo apt-get install -y mariadb-server mariadb-client libsqlite3-mod-spatialite libgdal-dev gdal-bin rasterio
# Config PostgreSQL
- name: Configure PostgreSQL
Expand Down Expand Up @@ -161,9 +148,7 @@ jobs:
# Run the test suite
- name: Run the tests
env:
SPATIALITE_LIBRARY_PATH: /home/runner/micromamba/envs/test_${{ matrix.python-version.flag }}/lib/mod_spatialite.so
PROJ_DATA: /home/runner/micromamba/envs/test_${{ matrix.python-version.flag }}/share/proj
PROJ_LIB: /home/runner/micromamba/envs/test_${{ matrix.python-version.flag }}/share/proj
SPATIALITE_LIBRARY_PATH: /usr/lib/x86_64-linux-gnu/mod_spatialite.so
COVERAGE_FILE: .coverage
PYTEST_MYSQL_DB_URL: mysql://gis:gis@127.0.0.1:3307/gis
PYTEST_MARIADB_DB_URL: mariadb://gis:gis@127.0.0.1:3308/gis
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
alembic
flake8
mysql
numpy<2
pytest
pytest-cov
pytest-html
pytest-mypy
rasterio>=1.2,<=1.3.8
rasterio
3 changes: 0 additions & 3 deletions tests/gallery/test_insert_raster.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,6 @@ def test_insert_raster(self, session, conn, input_img):
metadata.create_all(conn)

# Load the image and transform it into a WKB
print("# ######################################################## #")
print(rasterio.show_versions())
print("# ######################################################## #")
with rasterio.open(str(filename), "r+") as dataset:
dataset.crs = rasterio.crs.CRS.from_epsg(4326)
expected_values = dataset.read()[0]
Expand Down

0 comments on commit 3679290

Please sign in to comment.