From 42faa60c7cac84d39d82201c7520eb016d5699a2 Mon Sep 17 00:00:00 2001 From: janf Date: Mon, 9 Oct 2023 21:20:21 +0200 Subject: [PATCH] add requirements to run on version 0.7.1 --- .gitignore | 2 + {titiler => src}/.gitignore | 0 {titiler => src}/LICENSE | 0 {titiler => src}/README.md | 0 src/app/__init__.py | 2 + {titiler => src}/app/pg.py | 0 {titiler => src}/app/test/__init__.py | 0 {titiler => src}/app/test/pgtest.py | 0 {titiler => src}/app/wmts.py | 4 -- {titiler => src}/docker-compose.yml | 0 .../dockerfiles/Dockerfile.uvicorn | 8 +-- src/requirements.txt | 54 +++++++++++++++++++ titiler/app/__init__.py | 8 --- titiler/app/function.json | 18 ------- 14 files changed, 63 insertions(+), 33 deletions(-) rename {titiler => src}/.gitignore (100%) rename {titiler => src}/LICENSE (100%) rename {titiler => src}/README.md (100%) create mode 100644 src/app/__init__.py rename {titiler => src}/app/pg.py (100%) rename {titiler => src}/app/test/__init__.py (100%) rename {titiler => src}/app/test/pgtest.py (100%) rename {titiler => src}/app/wmts.py (97%) rename {titiler => src}/docker-compose.yml (100%) rename {titiler => src}/dockerfiles/Dockerfile.uvicorn (80%) create mode 100644 src/requirements.txt delete mode 100644 titiler/app/__init__.py delete mode 100644 titiler/app/function.json diff --git a/.gitignore b/.gitignore index 9f11b75..d19e2db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .idea/ +Pipfile +Pipfile.lock \ No newline at end of file diff --git a/titiler/.gitignore b/src/.gitignore similarity index 100% rename from titiler/.gitignore rename to src/.gitignore diff --git a/titiler/LICENSE b/src/LICENSE similarity index 100% rename from titiler/LICENSE rename to src/LICENSE diff --git a/titiler/README.md b/src/README.md similarity index 100% rename from titiler/README.md rename to src/README.md diff --git a/src/app/__init__.py b/src/app/__init__.py new file mode 100644 index 0000000..63f06db --- /dev/null +++ b/src/app/__init__.py @@ -0,0 +1,2 @@ +from wmts import titiler_version +__version__ = titiler_version diff --git a/titiler/app/pg.py b/src/app/pg.py similarity index 100% rename from titiler/app/pg.py rename to src/app/pg.py diff --git a/titiler/app/test/__init__.py b/src/app/test/__init__.py similarity index 100% rename from titiler/app/test/__init__.py rename to src/app/test/__init__.py diff --git a/titiler/app/test/pgtest.py b/src/app/test/pgtest.py similarity index 100% rename from titiler/app/test/pgtest.py rename to src/app/test/pgtest.py diff --git a/titiler/app/wmts.py b/src/app/wmts.py similarity index 97% rename from titiler/app/wmts.py rename to src/app/wmts.py index 78dea04..5c70763 100644 --- a/titiler/app/wmts.py +++ b/src/app/wmts.py @@ -10,9 +10,6 @@ from titiler.application import __version__ as titiler_version from titiler.core.errors import DEFAULT_STATUS_CODES, add_exception_handlers from cogeo_mosaic.mosaic import MosaicJSON -# from titiler.core.middleware import (LoggerMiddleware, -# LowerCaseQueryStringMiddleware, -# TotalTimeMiddleware) from titiler.application.custom import templates from titiler.mosaic.errors import MOSAIC_STATUS_CODES from geojson_pydantic.features import Feature, FeatureCollection @@ -27,7 +24,6 @@ import attr from morecantile import TileMatrixSet -from rasterio.path import parse_path from rio_tiler.constants import WEB_MERCATOR_TMS from rio_tiler.errors import InvalidBandName from rio_tiler.io import BaseReader, COGReader, MultiBandReader diff --git a/titiler/docker-compose.yml b/src/docker-compose.yml similarity index 100% rename from titiler/docker-compose.yml rename to src/docker-compose.yml diff --git a/titiler/dockerfiles/Dockerfile.uvicorn b/src/dockerfiles/Dockerfile.uvicorn similarity index 80% rename from titiler/dockerfiles/Dockerfile.uvicorn rename to src/dockerfiles/Dockerfile.uvicorn index f80ddd4..3d62e3d 100644 --- a/titiler/dockerfiles/Dockerfile.uvicorn +++ b/src/dockerfiles/Dockerfile.uvicorn @@ -1,7 +1,7 @@ # Dockerfile for running titiler application with uvicorn server # Size ~600MB ARG PYTHON_VERSION=3.9 - +ARG TITILER_VERSION=0.7.1 FROM python:${PYTHON_VERSION}-slim RUN apt-get update && apt-get install curl -y @@ -19,8 +19,10 @@ WORKDIR /opt/wmts RUN python3 -m pip install -U pip RUN python3 -m pip install pipenv RUN pipenv --python ${PYTHON_VERSION} -RUN pipenv run pip install -U pip -RUN pipenv run pip install uvicorn titiler --no-cache-dir --upgrade +RUN pipenv run pip install -U pip +#RUN pipenv run pip install uvicorn #asyncpg postgis --no-cache-dir --upgrade +COPY requirements.txt /opt/wmts/ +RUN pipenv run pip install -r requirements.txt COPY app/wmts.py /opt/wmts/ diff --git a/src/requirements.txt b/src/requirements.txt new file mode 100644 index 0000000..dc003a0 --- /dev/null +++ b/src/requirements.txt @@ -0,0 +1,54 @@ +affine==2.3.1 +anyio==3.6.2 +attrs==22.1.0 +boto3==1.24.93 +botocore==1.27.93 +cachetools==5.2.0 +certifi==2022.9.24 +click==8.1.3 +click-plugins==1.1.1 +cligj==0.7.2 +cogeo-mosaic==4.1.0 +cramjam==2.5.0 +fastapi==0.85.1 +geojson-pydantic==0.4.3 +h11==0.12.0 +httpcore==0.15.0 +httpx==0.23.0 +idna==3.4 +Jinja2==3.1.2 +jmespath==1.0.1 +MarkupSafe==2.1.1 +mercantile==1.2.1 +morecantile==3.1.2 +numexpr==2.8.3 +numpy==1.23.4 +packaging==21.3 +pydantic==1.10.2 +pygeos==0.13 +pyparsing==3.0.9 +pyproj==3.4.0 +pystac==1.6.1 +python-dateutil==2.8.2 +python-dotenv==0.21.0 +rasterio==1.3.2 +rfc3986==1.5.0 +rio-cogeo==3.4.1 +rio-color==1.0.4 +rio-mucho==1.0.0 +rio-tiler==3.1.6 +s3transfer==0.6.0 +simplejson==3.17.6 +six==1.16.0 +sniffio==1.3.0 +snuggs==1.4.7 +starlette==0.20.4 +starlette-cramjam==0.3.1 +supermercado==0.2.0 +titiler==0.7.1 +titiler.application==0.7.1 +titiler.core==0.7.1 +titiler.mosaic==0.7.1 +typing_extensions==4.4.0 +urllib3==1.26.12 +uvicorn==0.18.3 \ No newline at end of file diff --git a/titiler/app/__init__.py b/titiler/app/__init__.py deleted file mode 100644 index faf103b..0000000 --- a/titiler/app/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -__version__='0.0.3' -import azure.functions as func -from .wmts import app - -def main( - req: func.HttpRequest, context: func.Context, -) -> func.HttpResponse: - return func.AsgiMiddleware(app).handle(req, context) diff --git a/titiler/app/function.json b/titiler/app/function.json deleted file mode 100644 index 9502939..0000000 --- a/titiler/app/function.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "scriptFile": "__init__.py", - "bindings": [ - { - "authLevel": "anonymous", - "type": "httpTrigger", - "direction": "in", - "name": "req", - - "route": "{*route}" - }, - { - "type": "http", - "direction": "out", - "name": "$return" - } - ] -}