diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0e2581a75..8af28f9e6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.6.0 hooks: - id: black language_version: python diff --git a/deployment/aws/package-lock.json b/deployment/aws/package-lock.json index e6072e3bd..f51c804b9 100644 --- a/deployment/aws/package-lock.json +++ b/deployment/aws/package-lock.json @@ -9,13 +9,13 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "cdk": "1.160.0" + "cdk": "^1.167.0" } }, "node_modules/aws-cdk": { - "version": "1.160.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-1.160.0.tgz", - "integrity": "sha512-WJu0Y1igEV0/RnVm+ppynYdlrqA1wD7mN9SNXJJA6VTozeboIZF9ZskwDkFZ6o1VXmvW/i8K2heSNLv2HuDZNQ==", + "version": "1.167.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-1.167.0.tgz", + "integrity": "sha512-QuaCSJhJFiK+DpKqE3UWaZDlwD1rsnLNgSN2kh3kp95IZWFja74k8fIMi+qqRIQIaIak6hkpIEYQ9y+wsH23Bw==", "bin": { "cdk": "bin/cdk" }, @@ -27,11 +27,11 @@ } }, "node_modules/cdk": { - "version": "1.160.0", - "resolved": "https://registry.npmjs.org/cdk/-/cdk-1.160.0.tgz", - "integrity": "sha512-ggZqbj5E3EmupBmJvOHiMmmkdl/rKGwCJRmFGQ6bjAiLXlfSTIuv3osZquB9q7fQBXC7PNNMlT6yPMFAM2e/Pw==", + "version": "1.167.0", + "resolved": "https://registry.npmjs.org/cdk/-/cdk-1.167.0.tgz", + "integrity": "sha512-i9dsu1UNo78h31JRd86oKMAi+zSSLGIi5AwlIlEpitCqYSmVBabbAqggUHw1pe2LtjSsb77A6Cgn2a4g2Yd7KQ==", "dependencies": { - "aws-cdk": "1.160.0" + "aws-cdk": "1.167.0" }, "bin": { "cdk": "bin/cdk" @@ -56,19 +56,19 @@ }, "dependencies": { "aws-cdk": { - "version": "1.160.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-1.160.0.tgz", - "integrity": "sha512-WJu0Y1igEV0/RnVm+ppynYdlrqA1wD7mN9SNXJJA6VTozeboIZF9ZskwDkFZ6o1VXmvW/i8K2heSNLv2HuDZNQ==", + "version": "1.167.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-1.167.0.tgz", + "integrity": "sha512-QuaCSJhJFiK+DpKqE3UWaZDlwD1rsnLNgSN2kh3kp95IZWFja74k8fIMi+qqRIQIaIak6hkpIEYQ9y+wsH23Bw==", "requires": { "fsevents": "2.3.2" } }, "cdk": { - "version": "1.160.0", - "resolved": "https://registry.npmjs.org/cdk/-/cdk-1.160.0.tgz", - "integrity": "sha512-ggZqbj5E3EmupBmJvOHiMmmkdl/rKGwCJRmFGQ6bjAiLXlfSTIuv3osZquB9q7fQBXC7PNNMlT6yPMFAM2e/Pw==", + "version": "1.167.0", + "resolved": "https://registry.npmjs.org/cdk/-/cdk-1.167.0.tgz", + "integrity": "sha512-i9dsu1UNo78h31JRd86oKMAi+zSSLGIi5AwlIlEpitCqYSmVBabbAqggUHw1pe2LtjSsb77A6Cgn2a4g2Yd7KQ==", "requires": { - "aws-cdk": "1.160.0" + "aws-cdk": "1.167.0" } }, "fsevents": { diff --git a/deployment/aws/package.json b/deployment/aws/package.json index 2186f36ef..29dcbe0f8 100644 --- a/deployment/aws/package.json +++ b/deployment/aws/package.json @@ -5,7 +5,7 @@ "license": "MIT", "private": true, "dependencies": { - "cdk": "1.160.0" + "cdk": "1.167.0" }, "scripts": { "cdk": "cdk" diff --git a/dockerfiles/Dockerfile.uvicorn b/dockerfiles/Dockerfile.uvicorn index 19277b774..da3581a5e 100644 --- a/dockerfiles/Dockerfile.uvicorn +++ b/dockerfiles/Dockerfile.uvicorn @@ -1,8 +1,11 @@ # Dockerfile for running titiler application with uvicorn server # Size ~600MB -ARG PYTHON_VERSION=3.9 - -FROM python:${PYTHON_VERSION}-slim +# R: Failed to process file dockerfiles/Dockerfile.uvicorn +# Could not automatically modify your base image, as it is fragmented over several statements. +ARG PYTHON_VERSION=3.11 +#FROM python:${PYTHON_VERSION}-slim +FROM python:${PYTHON_VERSION}-rc-slim +#FROM python:python:3.11-rc-slim RUN apt-get update && apt-get install curl -y diff --git a/src/titiler/core/setup.py b/src/titiler/core/setup.py index e0bf24da5..9aa1daabc 100644 --- a/src/titiler/core/setup.py +++ b/src/titiler/core/setup.py @@ -12,10 +12,11 @@ "numpy", "pydantic", "rasterio", - "rio-tiler>=3.1,<3.2", + "rio-tiler @ git+https://github.com/20treeAI/rio-tiler.git@patch_boto3#egg=rio-tiler-3.1.6.ov1", "simplejson", "importlib_resources>=1.1.0;python_version<'3.9'", "typing_extensions;python_version<'3.8'", + "pydash", ] extra_reqs = { "test": ["pytest", "pytest-cov", "pytest-asyncio", "requests"],