Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 6 additions & 18 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,16 @@ jobs:
py:
- "3.12"
postgis:
- "9.6-2.5-alpine"
- "10-2.5-alpine"
- "11-2.5-alpine"
- "12-2.5-alpine"
# Not working on PostGIS 3.4 yet
# - "12-3.4-alpine"
# - "13-3.4-alpine"
# - "14-3.4-alpine"
# - "15-3.4-alpine"
# - "16-3.4-alpine"
- "latest"
services:
geoserver:
image: tethysplatform/geoserver
image: docker.osgeo.org/geoserver:2.27.0
env:
ENABLED_NODES: 1
REST_NODES: 1
MAX_MEMORY: 512
MIN_MEMORY: 128
NUM_CORES: 2
MAX_TIMEOUT: 60
SKIP_DEMO_DATA: false
CORS_ENABLED: true
ENABLE_JSONP: true
ports:
- 8181:8181
- 8181:8080
postgis:
image: postgis/postgis:${{ matrix.postgis }}
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
- windows
- macos
py:
# - "3.13"
- "3.13"
- "3.12"
- "3.11"
- "3.10"
- "3.9"
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.py }} for test
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ docker-compose up -d

```
cd ..
tox -e e2e_geoserver_tests
tox -e e2e_gs_tests
```

6. It is recommended that after each run, you refresh the Docker containers. Run the following command to remove them:
Expand Down
2 changes: 1 addition & 1 deletion tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__author__ = 'swainn'
__author__ = "swainn"
20 changes: 6 additions & 14 deletions tests/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
version: "3.3"
services:
postgis:
image: "postgis/postgis:12-2.5"
image: "postgis/postgis:latest"
ports:
- "5432:5432"
environment:
- POSTGRES_PASSWORD=mysecretpassword
- POSTGRES_USER=postgres

geoserver:
image: "tethysplatform/geoserver"
image: "docker.osgeo.org/geoserver:2.27.0"
ports:
- "8181:8181"
- "8081:8081"
- "8082:8082"
- "8083:8083"
- "8084:8084"
- "8181:8080"
environment:
- ENABLED_NODES=4
- REST_NODES=1
- MAX_MEMORY=512
- MIN_MEMORY=512
- NUM_CORES=2
- MAX_TIMEOUT=60
- SKIP_DEMO_DATA=false
- CORS_ENABLED=true
- ENABLE_JSONP=true
Loading
Loading