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

move to tipg #55

Merged
merged 18 commits into from
Mar 16, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 3 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[settings]
profile = black
known_first_party = ["eoapi"]
4 changes: 4 additions & 0 deletions .mypy.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
no_implicit_optional = true
strict_optional = true
namespace_packages = true
explicit_package_bases = true
23 changes: 10 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.12.0
hooks:
- id: black
language_version: python

- repo: https://github.com/PyCQA/isort
rev: 5.4.2
rev: 5.12.0
hooks:
- id: isort
language_version: python

- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.238
hooks:
- id: flake8
language_version: python

- repo: https://github.com/PyCQA/pydocstyle
rev: 5.1.1
hooks:
- id: pydocstyle
language_version: python
- id: ruff
args: ["--fix"]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.812
rev: v0.991
hooks:
- id: mypy
language_version: python
additional_dependencies:
- types-requests
- types-attrs
10 changes: 0 additions & 10 deletions Dockerfile.features

This file was deleted.

34 changes: 1 addition & 33 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,42 +126,10 @@ services:
volumes:
- ./scripts:/tmp/scripts

features:
container_name: eoapi.features
build:
context: .
dockerfile: Dockerfile.features
ports:
- "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
environment:
# Application
- HOST=0.0.0.0
- PORT=8085
# https://github.com/tiangolo/uvicorn-gunicorn-docker#web_concurrency
- WEB_CONCURRENCY=10
# https://github.com/tiangolo/uvicorn-gunicorn-docker#workers_per_core
# - WORKERS_PER_CORE=1
# https://github.com/tiangolo/uvicorn-gunicorn-docker#max_workers
# - MAX_WORKERS=10
# Postgres connection
- POSTGRES_USER=username
- POSTGRES_PASS=password
- POSTGRES_DBNAME=postgis
- POSTGRES_HOST=database
- POSTGRES_PORT=5432
- DB_MIN_CONN_SIZE=1
- DB_MAX_CONN_SIZE=10
depends_on:
- database
command:
bash -c "bash /tmp/scripts/wait-for-it.sh database:5432 && /start.sh"
volumes:
- ./scripts:/tmp/scripts

database:
container_name: eoapi.db
platform: linux/amd64
image: ghcr.io/stac-utils/pgstac:v0.6.11
image: ghcr.io/stac-utils/pgstac:v0.6.13
environment:
- POSTGRES_USER=username
- POSTGRES_PASSWORD=password
Expand Down
12 changes: 12 additions & 0 deletions ruff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
select = [
"D1", # pydocstyle errors
"E", # pycodestyle errors
"W", # pycodestyle warnings
"C", # flake8-comprehensions
"B", # flake8-bugbear
]
ignore = [
"E501", # line too long, handled by black
"B008", # do not perform function calls in argument defaults
"B905", # ignore zip() without an explicit strict= parameter, only support with python >3.10
]
7 changes: 0 additions & 7 deletions src/eoapi/features/README.md

This file was deleted.

1 change: 0 additions & 1 deletion src/eoapi/features/eoapi/features/__init__.py

This file was deleted.

44 changes: 0 additions & 44 deletions src/eoapi/features/eoapi/features/app.py

This file was deleted.

37 changes: 0 additions & 37 deletions src/eoapi/features/eoapi/features/config.py

This file was deleted.

88 changes: 0 additions & 88 deletions src/eoapi/features/eoapi/features/db.py

This file was deleted.

52 changes: 0 additions & 52 deletions src/eoapi/features/eoapi/features/errors.py

This file was deleted.

Loading