From 546e08948d0ee556f4f9c7701014eeea1f87cc37 Mon Sep 17 00:00:00 2001 From: vincentsarago Date: Tue, 23 Apr 2024 14:32:46 +0200 Subject: [PATCH 1/4] fix req --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bfd8073..4bb8695 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,8 @@ classifiers = [ dynamic = ["version"] dependencies = [ "cftime==1.6.3", - "h5netcdf==1.3.0", + "h5netcdf==1.1.0; python_version=='3.8'", + "h5netcdf==1.3.0; python_version>='3.9'", "xarray==2024.3.0", "rioxarray==0.15.0", "zarr==2.17.2", From c99afff94dad2a5ea3d08c433ffdd71c8f4180b2 Mon Sep 17 00:00:00 2001 From: vincentsarago Date: Tue, 23 Apr 2024 14:38:22 +0200 Subject: [PATCH 2/4] add back emile changes --- infrastructure/aws/package.json | 2 +- infrastructure/aws/requirements-cdk.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/aws/package.json b/infrastructure/aws/package.json index 040bfa6..490d9fe 100644 --- a/infrastructure/aws/package.json +++ b/infrastructure/aws/package.json @@ -5,7 +5,7 @@ "license": "MIT", "private": true, "dependencies": { - "cdk": "2.76.0-alpha.0" + "cdk": "2.138.0" }, "scripts": { "cdk": "cdk" diff --git a/infrastructure/aws/requirements-cdk.txt b/infrastructure/aws/requirements-cdk.txt index 68ad0c6..cea7fda 100644 --- a/infrastructure/aws/requirements-cdk.txt +++ b/infrastructure/aws/requirements-cdk.txt @@ -1,6 +1,6 @@ -aws-cdk-lib==2.76.0 -aws_cdk-aws_apigatewayv2_alpha==2.76.0a0 -aws_cdk-aws_apigatewayv2_integrations_alpha==2.76.0a0 +aws-cdk-lib==2.138.0 +aws_cdk-aws_apigatewayv2_alpha==2.114.1a0 +aws_cdk-aws_apigatewayv2_integrations_alpha==2.114.1a0 constructs>=10.0.0 pydantic~=1.0 From b7f9c6e3ad46e656336ec0ae186906f83881b08e Mon Sep 17 00:00:00 2001 From: vincentsarago Date: Tue, 23 Apr 2024 14:40:30 +0200 Subject: [PATCH 3/4] remove python 3.8 --- .github/workflows/ci.yml | 6 +++--- pyproject.toml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7840cb8..70d7e7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 @@ -56,7 +56,7 @@ jobs: needs: [tests] runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/v') - + defaults: run: working-directory: infrastructure/aws @@ -98,7 +98,7 @@ jobs: TITILER_XARRAY_DEBUG: True STACK_ALARM_EMAIL: ${{ secrets.ALARM_EMAIL }} STACK_STAGE: development - + # Build and deploy to production deployment whenever there a new tag is pushed - name: Build & Deploy Production if: startsWith(github.ref, 'refs/tags/v') diff --git a/pyproject.toml b/pyproject.toml index 4bb8695..06818f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "titiler.xarray" description = "TiTiler extension for xarray." readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" authors = [ {name = "Vincent Sarago", email = "vincent@developmentseed.com"}, ] @@ -17,17 +17,16 @@ classifiers = [ "Intended Audience :: Information Technology", "Intended Audience :: Science/Research", "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering :: GIS", ] dynamic = ["version"] dependencies = [ "cftime==1.6.3", - "h5netcdf==1.1.0; python_version=='3.8'", - "h5netcdf==1.3.0; python_version>='3.9'", + "h5netcdf==1.3.0", "xarray==2024.3.0", "rioxarray==0.15.0", "zarr==2.17.2", From f63dbee4cf0841710d5f444c0e61521f5eedfb59 Mon Sep 17 00:00:00 2001 From: vincentsarago Date: Tue, 23 Apr 2024 14:43:36 +0200 Subject: [PATCH 4/4] remove python >3.10 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70d7e7c..f7f5ce2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10'] steps: - uses: actions/checkout@v3