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.

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

Patch/update ci #177

Merged
merged 3 commits into from
Aug 22, 2024
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
11 changes: 10 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand All @@ -12,3 +11,13 @@ updates:
all:
patterns:
- "*"

- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
groups:
pgstac:
dependency-type: "development"
patterns:
- "pypgstac*"
28 changes: 9 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
Expand All @@ -37,12 +37,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: install lib postgres
run: |
sudo apt update
wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | sudo apt-key add -
echo "deb [arch=amd64] http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" | sudo tee /etc/apt/sources.list.d/postgresql.list
sudo apt update
sudo apt-get install --yes libpq-dev postgis postgresql-14-postgis-3
uses: nyurik/action-setup-postgis@v2

- name: Install dependencies
run: |
Expand All @@ -69,29 +64,24 @@ jobs:

benchmark:
needs: [tests]
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
PGSTAC_VERSION: '0.8.1'
PGSTAC_VERSION: '0.9.1'
steps:
- uses: actions/checkout@v4

- name: Set up Python
- name: Set up Python ${{ env.LATEST_PY_VERSION }}
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: ${{ env.LATEST_PY_VERSION }}

- name: Launch services
run: docker-compose up -d tiler-uvicorn
run: docker compose up -d tiler-uvicorn
env:
PGSTAC_VERSION: ${{ env.PGSTAC_VERSION }}

- name: install lib postgres
run: |
sudo apt update
wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | sudo apt-key add -
echo "deb [arch=amd64] http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" | sudo tee /etc/apt/sources.list.d/postgresql.list
sudo apt update
sudo apt-get install --yes libpq-dev postgis postgresql-14-postgis-3
uses: nyurik/action-setup-postgis@v2

- name: Install python dependencies
run: |
Expand Down Expand Up @@ -127,7 +117,7 @@ jobs:
auto-push: ${{ github.ref == 'refs/heads/main' }}

- name: Stop services
run: docker-compose stop
run: docker compose stop

publish:
needs: [tests]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ $ uvicorn titiler.pgstac.main:app --reload
```
$ git clone https://github.com/stac-utils/titiler-pgstac.git
$ cd titiler-pgstac
$ docker-compose up --build tiler
$ docker compose up --build tiler
```

It runs `titiler.pgstac` using Gunicorn web server. To run Uvicorn based version:

```
$ docker-compose up --build tiler-uvicorn
$ docker compose up --build tiler-uvicorn
```

## Contribution & Development
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ test = [
"pytest-cov",
"pytest-asyncio",
"httpx",
"pypgstac>=0.8",
"pypgstac>=0.7,<=0.9.1",
"psycopg2",
"pytest-pgsql",
]
Expand Down
Loading