diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 5f8524cc..11a36598 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -24,7 +24,7 @@ jobs: siege -C - name: Start containers - run: docker-compose -f "docker-compose.yml" up -d --build benchmark + run: docker compose -f "docker-compose.yml" up -d --build benchmark # Let's wait a bit to make sure the docker are up - name: Sleep for 10 seconds @@ -49,7 +49,7 @@ jobs: - name: Stop containers if: always() - run: docker-compose -f "docker-compose.yml" down + run: docker compose -f "docker-compose.yml" down - name: Merge Outputs run: | diff --git a/CHANGES.md b/CHANGES.md index 76b311c0..4bf69da4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,6 +36,10 @@ * Use `.as_dict()` method when passing option to rio-tiler Reader's methods to avoid parameter conflicts when using custom Readers. +## 0.18.6 (2024-08-27) + +* Switch back to `fastapi` instead of `fastapi-slim` and use `>=0.109.0` version + ## 0.18.5 (2024-07-03) * Set version requirement for FastAPI to `>=0.111.0` diff --git a/README.md b/README.md index 44f4aed1..c38adc3d 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ docker run --name titiler \ git clone https://github.com/developmentseed/titiler.git cd titiler -docker-compose up --build titiler # or titiler-uvicorn +docker compose up --build titiler # or titiler-uvicorn ``` Some options can be set via environment variables, see: https://github.com/tiangolo/uvicorn-gunicorn-docker#advanced-usage diff --git a/deployment/aws/lambda/Dockerfile b/deployment/aws/lambda/Dockerfile index 4acc3402..d8b0a47a 100644 --- a/deployment/aws/lambda/Dockerfile +++ b/deployment/aws/lambda/Dockerfile @@ -4,8 +4,11 @@ FROM --platform=linux/amd64 public.ecr.aws/lambda/python:${PYTHON_VERSION} WORKDIR /tmp +# Install system dependencies to compile (numexpr) +RUN yum install -y gcc-c++ + RUN python -m pip install pip -U -RUN python -m pip install "titiler.application==0.18.5" "mangum>=0.10.0" "numexpr==2.10.0" -t /asset --no-binary pydantic +RUN python -m pip install "titiler.application==0.18.6" "mangum>=0.10.0" -t /asset --no-binary pydantic # Reduce package size and remove useless files RUN cd /asset && find . -type f -name '*.pyc' | while read f; do n=$(echo $f | sed 's/__pycache__\///' | sed 's/.cpython-[0-9]*//'); cp $f $n; done; @@ -14,6 +17,9 @@ RUN cd /asset && find . -type f -a -name '*.py' -print0 | xargs -0 rm -f RUN find /asset -type d -a -name 'tests' -print0 | xargs -0 rm -rf RUN rm -rdf /asset/numpy/doc/ /asset/boto3* /asset/botocore* /asset/bin /asset/geos_license /asset/Misc +# Remove system dependencies +RUN yum remove -y gcc-c++ + COPY lambda/handler.py /asset/handler.py CMD ["echo", "hello world"] diff --git a/deployment/k8s/charts/Chart.yaml b/deployment/k8s/charts/Chart.yaml index 8c1f5ac9..7bf02e48 100644 --- a/deployment/k8s/charts/Chart.yaml +++ b/deployment/k8s/charts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 0.18.5 +appVersion: 0.18.6 description: A dynamic Web Map tile server name: titiler -version: 1.1.2 +version: 1.1.3 icon: https://raw.githubusercontent.com/developmentseed/titiler/main/docs/logos/TiTiler_logo_small.png maintainers: - name: emmanuelmathot # Emmanuel Mathot diff --git a/pyproject.toml b/pyproject.toml index 80f128e4..9cb757cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,12 +29,12 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering :: GIS", ] -version="0.18.5" +version="0.18.6" dependencies = [ - "titiler.core==0.18.5", - "titiler.extensions==0.18.5", - "titiler.mosaic==0.18.5", - "titiler.application==0.18.5", + "titiler.core==0.18.6", + "titiler.extensions==0.18.6", + "titiler.mosaic==0.18.6", + "titiler.application==0.18.6", ] [project.urls] @@ -126,7 +126,7 @@ filterwarnings = [ bypass-selection = true [tool.bumpversion] -current_version = "0.18.5" +current_version = "0.18.6" parse = """(?x) (?P\\d+)\\. (?P\\d+)\\. diff --git a/src/titiler/application/pyproject.toml b/src/titiler/application/pyproject.toml index d0404b0f..bbaaca65 100644 --- a/src/titiler/application/pyproject.toml +++ b/src/titiler/application/pyproject.toml @@ -31,9 +31,9 @@ classifiers = [ ] dynamic = ["version"] dependencies = [ - "titiler.core==0.18.5", - "titiler.extensions[cogeo,stac]==0.18.5", - "titiler.mosaic==0.18.5", + "titiler.core==0.18.6", + "titiler.extensions[cogeo,stac]==0.18.6", + "titiler.mosaic==0.18.6", "starlette-cramjam>=0.3,<0.4", "pydantic-settings~=2.0", ] diff --git a/src/titiler/application/titiler/application/__init__.py b/src/titiler/application/titiler/application/__init__.py index 63f02e8e..6e61632c 100644 --- a/src/titiler/application/titiler/application/__init__.py +++ b/src/titiler/application/titiler/application/__init__.py @@ -1,3 +1,3 @@ """titiler.application""" -__version__ = "0.18.5" +__version__ = "0.18.6" diff --git a/src/titiler/core/pyproject.toml b/src/titiler/core/pyproject.toml index 6fe8a364..34afdfe1 100644 --- a/src/titiler/core/pyproject.toml +++ b/src/titiler/core/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ ] dynamic = ["version"] dependencies = [ - "fastapi-slim>=0.111.0", + "fastapi>=0.108.0", "geojson-pydantic>=1.0,<2.0", "jinja2>=2.11.2,<4.0.0", "numpy", diff --git a/src/titiler/core/titiler/core/__init__.py b/src/titiler/core/titiler/core/__init__.py index 1ce17fcb..396515b6 100644 --- a/src/titiler/core/titiler/core/__init__.py +++ b/src/titiler/core/titiler/core/__init__.py @@ -1,6 +1,6 @@ """titiler.core""" -__version__ = "0.18.5" +__version__ = "0.18.6" from . import dependencies, errors, factory, routing # noqa from .factory import ( # noqa diff --git a/src/titiler/extensions/pyproject.toml b/src/titiler/extensions/pyproject.toml index 1f21d239..980d0a5a 100644 --- a/src/titiler/extensions/pyproject.toml +++ b/src/titiler/extensions/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ ] dynamic = ["version"] dependencies = [ - "titiler.core==0.18.5" + "titiler.core==0.18.6" ] [project.optional-dependencies] diff --git a/src/titiler/extensions/titiler/extensions/__init__.py b/src/titiler/extensions/titiler/extensions/__init__.py index 04c3577c..84260a30 100644 --- a/src/titiler/extensions/titiler/extensions/__init__.py +++ b/src/titiler/extensions/titiler/extensions/__init__.py @@ -1,6 +1,6 @@ """titiler.extensions""" -__version__ = "0.18.5" +__version__ = "0.18.6" from .cogeo import cogValidateExtension # noqa from .stac import stacExtension # noqa diff --git a/src/titiler/mosaic/pyproject.toml b/src/titiler/mosaic/pyproject.toml index 6d21b864..575c2b6d 100644 --- a/src/titiler/mosaic/pyproject.toml +++ b/src/titiler/mosaic/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ ] dynamic = ["version"] dependencies = [ - "titiler.core==0.18.5", + "titiler.core==0.18.6", "cogeo-mosaic>=7.0,<8.0", ] diff --git a/src/titiler/mosaic/titiler/mosaic/__init__.py b/src/titiler/mosaic/titiler/mosaic/__init__.py index 4fe102c4..3d6450fa 100644 --- a/src/titiler/mosaic/titiler/mosaic/__init__.py +++ b/src/titiler/mosaic/titiler/mosaic/__init__.py @@ -1,6 +1,6 @@ """titiler.mosaic""" -__version__ = "0.18.5" +__version__ = "0.18.6" from . import errors, factory # noqa from .factory import MosaicTilerFactory # noqa