Skip to content

Commit 8bbec40

Browse files
gadomskigadomski
authored
Remove backend repos (#555)
* feat: remove backend repos * docs: fix readme * docs: more doc fixups * fix, tests: add httpx to dev dependencies * fix: remove wait-for-it script * docs, fix: nav
1 parent 2f2faa2 commit 8bbec40

File tree

111 files changed

+196
-16607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+196
-16607
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ updates:
1212
directory: "/stac_fastapi/api"
1313
schedule:
1414
interval: weekly
15-
- package-ecosystem: pip
16-
directory: "/stac_fastapi/api"
17-
schedule:
18-
interval: weekly
1915
- package-ecosystem: pip
2016
directory: "/stac_fastapi/types"
2117
schedule:
@@ -24,11 +20,3 @@ updates:
2420
directory: "/stac_fastapi/extensions"
2521
schedule:
2622
interval: weekly
27-
- package-ecosystem: pip
28-
directory: "/stac_fastapi/pgstac"
29-
schedule:
30-
interval: weekly
31-
- package-ecosystem: pip
32-
directory: "/stac_fastapi/sqlalchemy"
33-
schedule:
34-
interval: weekly

‎.github/workflows/cicd.yaml‎

Lines changed: 2 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ jobs:
5353
python -m pip install pre-commit
5454
pre-commit run --all-files
5555
56-
- name: Install pipenv
57-
run: |
58-
python -m pip install --upgrade pipenv wheel
59-
6056
- name: Install types
6157
run: |
6258
pip install ./stac_fastapi/types[dev]
@@ -69,118 +65,10 @@ jobs:
6965
run: |
7066
pip install ./stac_fastapi/extensions[dev]
7167
72-
- name: Install sqlalchemy stac-fastapi
73-
run: |
74-
pip install ./stac_fastapi/sqlalchemy[dev,server]
75-
76-
- name: Install pgstac stac-fastapi
77-
run: |
78-
pip install ./stac_fastapi/pgstac[dev,server]
79-
80-
- name: Run migration
81-
run: |
82-
cd stac_fastapi/sqlalchemy && alembic upgrade head
83-
env:
84-
POSTGRES_USER: username
85-
POSTGRES_PASS: password
86-
POSTGRES_DBNAME: postgis
87-
POSTGRES_HOST: localhost
88-
POSTGRES_PORT: 5432
89-
90-
- name: Run test suite
91-
run: |
92-
cd stac_fastapi/api && pipenv run pytest -svvv
93-
env:
94-
ENVIRONMENT: testing
95-
96-
- name: Run test suite
97-
run: |
98-
cd stac_fastapi/types && pipenv run pytest -svvv
99-
env:
100-
ENVIRONMENT: testing
101-
102-
- name: Run test suite
103-
run: |
104-
cd stac_fastapi/sqlalchemy && pipenv run pytest -svvv
105-
env:
106-
ENVIRONMENT: testing
107-
POSTGRES_USER: username
108-
POSTGRES_PASS: password
109-
POSTGRES_DBNAME: postgis
110-
POSTGRES_HOST_READER: localhost
111-
POSTGRES_HOST_WRITER: localhost
112-
POSTGRES_PORT: 5432
113-
114-
- name: Run test suite
115-
run: |
116-
cd stac_fastapi/pgstac && pipenv run pytest -svvv
68+
- name: Test
69+
run: pytest -svvv
11770
env:
11871
ENVIRONMENT: testing
119-
POSTGRES_USER: username
120-
POSTGRES_PASS: password
121-
POSTGRES_DBNAME: postgis
122-
POSTGRES_HOST_READER: localhost
123-
POSTGRES_HOST_WRITER: localhost
124-
POSTGRES_PORT: 5432
125-
126-
validate:
127-
runs-on: ubuntu-latest
128-
strategy:
129-
fail-fast: false
130-
matrix:
131-
backend: ["sqlalchemy", "pgstac"]
132-
services:
133-
pgstac:
134-
image: ghcr.io/stac-utils/pgstac:v0.7.1
135-
env:
136-
POSTGRES_USER: username
137-
POSTGRES_PASSWORD: password
138-
POSTGRES_DB: postgis
139-
PGUSER: username
140-
PGPASSWORD: password
141-
PGDATABASE: postgis
142-
options: >-
143-
--health-cmd pg_isready
144-
--health-interval 10s
145-
--health-timeout 5s
146-
--health-retries 5
147-
--log-driver none
148-
ports:
149-
- 5432:5432
150-
steps:
151-
- name: Check out repository code
152-
uses: actions/checkout@v3
153-
- name: Setup Python
154-
uses: actions/setup-python@v3
155-
with:
156-
python-version: "3.10"
157-
cache: pip
158-
cache-dependency-path: stac_fastapi/pgstac/setup.cfg
159-
- name: Install stac-fastapi and stac-api-validator
160-
run: pip install ./stac_fastapi/api ./stac_fastapi/types ./stac_fastapi/${{ matrix.backend }}[server] stac-api-validator==0.4.1
161-
- name: Run migration
162-
if: ${{ matrix.backend == 'sqlalchemy' }}
163-
run: cd stac_fastapi/sqlalchemy && alembic upgrade head
164-
env:
165-
POSTGRES_USER: username
166-
POSTGRES_PASS: password
167-
POSTGRES_DBNAME: postgis
168-
POSTGRES_HOST: localhost
169-
POSTGRES_PORT: 5432
170-
- name: Load data and validate
171-
run: python -m stac_fastapi.${{ matrix.backend }}.app & ./scripts/wait-for-it.sh localhost:8080 && python ./scripts/ingest_joplin.py http://localhost:8080 && ./scripts/validate http://localhost:8080
172-
env:
173-
POSTGRES_USER: username
174-
POSTGRES_PASS: password
175-
POSTGRES_DBNAME: postgis
176-
POSTGRES_HOST_READER: localhost
177-
POSTGRES_HOST_WRITER: localhost
178-
POSTGRES_PORT: 5432
179-
PGUSER: username
180-
PGPASSWORD: password
181-
PGDATABASE: postgis
182-
APP_HOST: 0.0.0.0
183-
APP_PORT: 8080
18472

18573
test-docs:
18674
runs-on: ubuntu-latest

‎.github/workflows/deploy_mkdocs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
stac_fastapi/api \
3333
stac_fastapi/types \
3434
stac_fastapi/extensions \
35-
stac_fastapi/sqlalchemy
3635
python -m pip install mkdocs mkdocs-material pdocs
3736
3837
- name: update API docs

‎.github/workflows/packages.yml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.pre-commit-config.yaml‎

Lines changed: 53 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,54 @@
11
repos:
2-
- repo: https://github.com/PyCQA/isort
3-
rev: 5.12.0
4-
hooks:
5-
- id: isort
6-
language_version: python3.8
7-
-
8-
repo: https://github.com/psf/black
9-
rev: 22.12.0
10-
hooks:
11-
- id: black
12-
args: ['--safe']
13-
language_version: python3.8
14-
-
15-
repo: https://github.com/pycqa/flake8
16-
rev: 6.0.0
17-
hooks:
18-
- id: flake8
19-
language_version: python3.8
20-
args: [
21-
# E501 let black handle all line length decisions
22-
# W503 black conflicts with "line break before operator" rule
23-
# E203 black conflicts with "whitespace before ':'" rule
24-
'--ignore=E501,W503,E203,C901']
25-
-
26-
repo: https://github.com/chewse/pre-commit-mirrors-pydocstyle
27-
# 2.1.1
28-
rev: v2.1.1
29-
hooks:
30-
- id: pydocstyle
31-
language_version: python3.8
32-
exclude: '.*(test|alembic|scripts).*'
33-
args: [
34-
# Check for docstring presence only
35-
'--select=D1',
36-
37-
]
38-
# Don't require docstrings for tests
39-
# '--match=(?!test).*\.py']
40-
# -
41-
# repo: https://github.com/pre-commit/mirrors-mypy
42-
# rev: v0.770
43-
# hooks:
44-
# - id: mypy
45-
# language_version: python3.8
46-
# args: [--no-strict-optional, --ignore-missing-imports]
47-
-
48-
repo: https://github.com/PyCQA/pydocstyle
49-
rev: 6.3.0
50-
hooks:
51-
- id: pydocstyle
52-
language_version: python3.8
53-
exclude: '.*(test|alembic|scripts).*'
54-
#args: [
55-
# Don't require docstrings for tests
56-
#'--match=(?!test|alembic|scripts).*\.py',
57-
#]
2+
- repo: https://github.com/PyCQA/isort
3+
rev: 5.12.0
4+
hooks:
5+
- id: isort
6+
language_version: python3.8
7+
- repo: https://github.com/psf/black
8+
rev: 22.12.0
9+
hooks:
10+
- id: black
11+
args: ["--safe"]
12+
language_version: python3.8
13+
- repo: https://github.com/pycqa/flake8
14+
rev: 6.0.0
15+
hooks:
16+
- id: flake8
17+
language_version: python3.8
18+
args: [
19+
# E501 let black handle all line length decisions
20+
# W503 black conflicts with "line break before operator" rule
21+
# E203 black conflicts with "whitespace before ':'" rule
22+
"--ignore=E501,W503,E203,C901",
23+
]
24+
- repo: https://github.com/chewse/pre-commit-mirrors-pydocstyle
25+
# 2.1.1
26+
rev: v2.1.1
27+
hooks:
28+
- id: pydocstyle
29+
language_version: python3.8
30+
exclude: ".*(test|alembic|scripts).*"
31+
args:
32+
[
33+
# Check for docstring presence only
34+
"--select=D1",
35+
]
36+
# Don't require docstrings for tests
37+
# '--match=(?!test).*\.py']
38+
# -
39+
# repo: https://github.com/pre-commit/mirrors-mypy
40+
# rev: v0.770
41+
# hooks:
42+
# - id: mypy
43+
# language_version: python3.8
44+
# args: [--no-strict-optional, --ignore-missing-imports]
45+
- repo: https://github.com/PyCQA/pydocstyle
46+
rev: 6.3.0
47+
hooks:
48+
- id: pydocstyle
49+
language_version: python3.8
50+
exclude: ".*(test|alembic|scripts).*"
51+
#args: [
52+
# Don't require docstrings for tests
53+
#'--match=(?!test|alembic|scripts).*\.py',
54+
#]

‎CHANGES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
* Default branch to **main** ([#544](https://github.com/stac-utils/stac-fastapi/pull/544))
1010

11+
### Removed
12+
13+
* Backends ([#555](https://github.com/stac-utils/stac-fastapi/pull/555))
14+
* **stac-fastapi-pgstac**: <https://github.com/stac-utils/stac-fastapi-pgstac>
15+
* **stac-fastapi-sqlalchemy**: <https://github.com/stac-utils/stac-fastapi-sqlalchemy>
16+
1117
### Fixed
1218

1319
* Use `V()` instead of f-strings for pgstac queries ([#554](https://github.com/stac-utils/stac-fastapi/pull/554))

‎docker/Dockerfile‎ renamed to ‎Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,4 @@ COPY . /app
1818

1919
RUN pip install -e ./stac_fastapi/types[dev] && \
2020
pip install -e ./stac_fastapi/api[dev] && \
21-
pip install -e ./stac_fastapi/extensions[dev] && \
22-
pip install -e ./stac_fastapi/sqlalchemy[dev,server] && \
23-
pip install -e ./stac_fastapi/pgstac[dev,server]
21+
pip install -e ./stac_fastapi/extensions[dev]

‎docker/Dockerfile.docs‎ renamed to ‎Dockerfile.docs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ WORKDIR /opt/src
1313
RUN python -m pip install \
1414
stac_fastapi/api \
1515
stac_fastapi/types \
16-
stac_fastapi/extensions \
17-
stac_fastapi/sqlalchemy
16+
stac_fastapi/extensions
1817

1918
CMD ["pdocs", \
20-
"as_markdown", \
21-
"--output_dir", \
22-
"docs/api/", \
23-
"--exclude_source", \
24-
"--overwrite", \
25-
"stac_fastapi"]
19+
"as_markdown", \
20+
"--output_dir", \
21+
"docs/api/", \
22+
"--exclude_source", \
23+
"--overwrite", \
24+
"stac_fastapi"]

0 commit comments

Comments
 (0)