From 11500e2c86e49e2342530c5afed69b06233502aa Mon Sep 17 00:00:00 2001 From: Adeel Hassan Date: Thu, 29 Aug 2024 16:39:29 -0400 Subject: [PATCH 1/2] update changelog and migration guide for v0.31.1 --- docs/changelog.rst | 14 ++++++++++++++ docs/migration/v0-30_to_v0-31.rst | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index b8d37e5a0..976136e85 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,20 @@ CHANGELOG ========= +Raster Vision 0.31.1 +-------------------- + +* Fixes: + + * Restore compatibility with python<3.11 by only importing ``typing.Self`` under ``if TPYE_CHECKING`` (`#2221 `__) + * Remove ``awscli`` as a dependency from ``rastervision_aws_s3`` and make it a dev dependency instead (`#2220 `__) + * Make ``max_windows`` a required argument for ``RandomWindowGeoDataset`` (`#2223 `__) + +* Maintenance: + + * Update docker dependency: Bump jupyterlab from 4.1.8 to 4.2.5 (`#2224 `__) + + Raster Vision 0.31.0 -------------------- diff --git a/docs/migration/v0-30_to_v0-31.rst b/docs/migration/v0-30_to_v0-31.rst index c45d93dc9..7b836e655 100644 --- a/docs/migration/v0-30_to_v0-31.rst +++ b/docs/migration/v0-30_to_v0-31.rst @@ -9,4 +9,5 @@ v0.30 to v0.31 * Default padding behavior has changed. See `SlidingWindowGeoDataset `_. * You no longer need to manually figure out the right padding value to use when using ``crop_sz`` during prediction. It is determined automatically such that no pixels around the edges are left out. -* ``force_same_dtype`` has been removed from :class:`.MultiRasterSource` and :class:`.MultiRasterSourceConfig`. Sub-raster sources are now always expected to have the same dtype. +* ``force_same_dtype`` has been removed from :class:`.MultiRasterSource` and :class:`.MultiRasterSourceConfig`. Sub-raster sources are now always expected to have the same ``dtype``. +* ``max_windows`` is now a required argument in :class:`.RandomWindowGeoDataset`. From 22e9c65e0700432bcba8b425edf880dccfdb706c Mon Sep 17 00:00:00 2001 From: Adeel Hassan Date: Fri, 30 Aug 2024 11:36:32 -0400 Subject: [PATCH 2/2] bump version to v0.31.1 --- cookiecutter_template/cookiecutter.json | 4 ++-- .../requirements.txt | 2 +- docs/conf.py | 2 +- rastervision_aws_batch/requirements.txt | 2 +- rastervision_aws_batch/setup.py | 2 +- rastervision_aws_s3/requirements.txt | 2 +- rastervision_aws_s3/setup.py | 2 +- rastervision_aws_sagemaker/requirements.txt | 2 +- rastervision_aws_sagemaker/setup.py | 2 +- rastervision_core/requirements.txt | 2 +- rastervision_core/setup.py | 2 +- rastervision_gdal_vsi/requirements.txt | 2 +- rastervision_gdal_vsi/setup.py | 2 +- .../rastervision/pipeline/version.py | 2 +- rastervision_pipeline/setup.py | 2 +- rastervision_pytorch_backend/requirements.txt | 6 +++--- rastervision_pytorch_backend/setup.py | 2 +- rastervision_pytorch_learner/requirements.txt | 4 ++-- rastervision_pytorch_learner/setup.py | 2 +- requirements.txt | 12 ++++++------ setup.py | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cookiecutter_template/cookiecutter.json b/cookiecutter_template/cookiecutter.json index 21e07caf1..6960ce8a3 100644 --- a/cookiecutter_template/cookiecutter.json +++ b/cookiecutter_template/cookiecutter.json @@ -2,8 +2,8 @@ "caps_project_name": "MY_PROJECT", "project_name": "my_project", "docker_image": "my_project", - "parent_docker_image": "quay.io/azavea/raster-vision:pytorch-0.31.0", - "version": "0.31.0", + "parent_docker_image": "quay.io/azavea/raster-vision:pytorch-0.31.1", + "version": "0.31.1", "description": "A Raster Vision plugin", "url": "https://github.com/azavea/raster-vision", "author": "Azavea", diff --git a/cookiecutter_template/{{cookiecutter.project_name}}/rastervision_{{cookiecutter.project_name}}/requirements.txt b/cookiecutter_template/{{cookiecutter.project_name}}/rastervision_{{cookiecutter.project_name}}/requirements.txt index 5c97c7ad0..140ae13f0 100644 --- a/cookiecutter_template/{{cookiecutter.project_name}}/rastervision_{{cookiecutter.project_name}}/requirements.txt +++ b/cookiecutter_template/{{cookiecutter.project_name}}/rastervision_{{cookiecutter.project_name}}/requirements.txt @@ -1 +1 @@ -rastervision==0.31.0 +rastervision==0.31.1 diff --git a/docs/conf.py b/docs/conf.py index 5cf26415b..ac381d396 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -74,7 +74,7 @@ def setup(app: 'Sphinx') -> None: # The short X.Y version. version = u'0.31' # The full version, including alpha/beta/rc tags -release = u'0.31.0' +release = u'0.31.1' # -- Extension configuration -------------------------------------------------- diff --git a/rastervision_aws_batch/requirements.txt b/rastervision_aws_batch/requirements.txt index e038a41d9..7589b9d4f 100644 --- a/rastervision_aws_batch/requirements.txt +++ b/rastervision_aws_batch/requirements.txt @@ -1,2 +1,2 @@ -rastervision_pipeline==0.31.0 +rastervision_pipeline==0.31.1 boto3==1.34.155 diff --git a/rastervision_aws_batch/setup.py b/rastervision_aws_batch/setup.py index bf20c3ed3..a09e898ed 100644 --- a/rastervision_aws_batch/setup.py +++ b/rastervision_aws_batch/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_aws_batch' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds an AWS Batch pipeline runner' requirement_constraints = {} diff --git a/rastervision_aws_s3/requirements.txt b/rastervision_aws_s3/requirements.txt index 797126acd..87476fbd5 100644 --- a/rastervision_aws_s3/requirements.txt +++ b/rastervision_aws_s3/requirements.txt @@ -1,4 +1,4 @@ -rastervision_pipeline==0.31.0 +rastervision_pipeline==0.31.1 boto3==1.34.155 tqdm==4.66.5 botocore==1.34.158 diff --git a/rastervision_aws_s3/setup.py b/rastervision_aws_s3/setup.py index 61059774f..4666a36c6 100644 --- a/rastervision_aws_s3/setup.py +++ b/rastervision_aws_s3/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_aws_s3' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds an AWS S3 file system' requirement_constraints = {} diff --git a/rastervision_aws_sagemaker/requirements.txt b/rastervision_aws_sagemaker/requirements.txt index 33276e7fd..43f491eab 100644 --- a/rastervision_aws_sagemaker/requirements.txt +++ b/rastervision_aws_sagemaker/requirements.txt @@ -1,2 +1,2 @@ -rastervision_pipeline==0.31.0 +rastervision_pipeline==0.31.1 sagemaker==2.227.0 diff --git a/rastervision_aws_sagemaker/setup.py b/rastervision_aws_sagemaker/setup.py index 4d4d1ce88..6db10577d 100644 --- a/rastervision_aws_sagemaker/setup.py +++ b/rastervision_aws_sagemaker/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_aws_sagemaker' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds an AWS SageMaker pipeline runner' requirement_constraints = {} diff --git a/rastervision_core/requirements.txt b/rastervision_core/requirements.txt index 42ad49cac..a67d82eb5 100644 --- a/rastervision_core/requirements.txt +++ b/rastervision_core/requirements.txt @@ -1,4 +1,4 @@ -rastervision_pipeline==0.31.0 +rastervision_pipeline==0.31.1 shapely==2.0.5 geopandas==1.0.1 numpy==1.26.4 diff --git a/rastervision_core/setup.py b/rastervision_core/setup.py index b78ef1d1f..07f34d00e 100644 --- a/rastervision_core/setup.py +++ b/rastervision_core/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_core' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds geospatial machine learning pipelines' requirement_constraints = {} diff --git a/rastervision_gdal_vsi/requirements.txt b/rastervision_gdal_vsi/requirements.txt index f5d459e2e..a46fca94a 100644 --- a/rastervision_gdal_vsi/requirements.txt +++ b/rastervision_gdal_vsi/requirements.txt @@ -1,2 +1,2 @@ -rastervision_pipeline==0.31.0 +rastervision_pipeline==0.31.1 gdal>=3.4.1,<=3.6.3 diff --git a/rastervision_gdal_vsi/setup.py b/rastervision_gdal_vsi/setup.py index 8a8905f34..277a16b17 100644 --- a/rastervision_gdal_vsi/setup.py +++ b/rastervision_gdal_vsi/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_gdal_vsi' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds a GDAL VSI file system' requirement_constraints = {} diff --git a/rastervision_pipeline/rastervision/pipeline/version.py b/rastervision_pipeline/rastervision/pipeline/version.py index d33feb4ef..d8fee424c 100644 --- a/rastervision_pipeline/rastervision/pipeline/version.py +++ b/rastervision_pipeline/rastervision/pipeline/version.py @@ -1,2 +1,2 @@ """Library version""" -__version__ = '0.31.0' +__version__ = '0.31.1' diff --git a/rastervision_pipeline/setup.py b/rastervision_pipeline/setup.py index 869ebfd5c..a2b3a81a5 100644 --- a/rastervision_pipeline/setup.py +++ b/rastervision_pipeline/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_pipeline' -version = '0.31.0' +version = '0.31.1' description = 'The main rastervision package for configuring, defining, and running pipelines' requirement_constraints = { 'pydantic': '>=2', diff --git a/rastervision_pytorch_backend/requirements.txt b/rastervision_pytorch_backend/requirements.txt index 879189ad6..2f19adfe9 100644 --- a/rastervision_pytorch_backend/requirements.txt +++ b/rastervision_pytorch_backend/requirements.txt @@ -1,3 +1,3 @@ -rastervision_pipeline==0.31.0 -rastervision_core==0.31.0 -rastervision_pytorch_learner==0.31.0 +rastervision_pipeline==0.31.1 +rastervision_core==0.31.1 +rastervision_pytorch_learner==0.31.1 diff --git a/rastervision_pytorch_backend/setup.py b/rastervision_pytorch_backend/setup.py index 7b819d8ad..c3735aeb4 100644 --- a/rastervision_pytorch_backend/setup.py +++ b/rastervision_pytorch_backend/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_pytorch_backend' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds PyTorch backends for rastervision.core pipelines' requirement_constraints = {} diff --git a/rastervision_pytorch_learner/requirements.txt b/rastervision_pytorch_learner/requirements.txt index 85066d85c..01fdd9f6a 100644 --- a/rastervision_pytorch_learner/requirements.txt +++ b/rastervision_pytorch_learner/requirements.txt @@ -1,5 +1,5 @@ -rastervision_pipeline==0.31.0 -rastervision_core==0.31.0 +rastervision_pipeline==0.31.1 +rastervision_core==0.31.1 numpy==1.26.4 pillow==10.4.0 torch==2.4.0 diff --git a/rastervision_pytorch_learner/setup.py b/rastervision_pytorch_learner/setup.py index ea2cb9b0a..d82d89d4b 100644 --- a/rastervision_pytorch_learner/setup.py +++ b/rastervision_pytorch_learner/setup.py @@ -5,7 +5,7 @@ import re name = 'rastervision_pytorch_learner' -version = '0.31.0' +version = '0.31.1' description = 'A rastervision plugin that adds PyTorch training pipelines' requirement_constraints = {} diff --git a/requirements.txt b/requirements.txt index 25753d2f2..9bb3d2c0f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -rastervision_pipeline==0.31.0 -rastervision_aws_s3==0.31.0 -rastervision_aws_batch==0.31.0 -rastervision_core==0.31.0 -rastervision_pytorch_learner==0.31.0 -rastervision_pytorch_backend==0.31.0 +rastervision_pipeline==0.31.1 +rastervision_aws_s3==0.31.1 +rastervision_aws_batch==0.31.1 +rastervision_core==0.31.1 +rastervision_pytorch_learner==0.31.1 +rastervision_pytorch_backend==0.31.1 diff --git a/setup.py b/setup.py index 991ebc2c5..8e392167c 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_namespace_packages import re -__version__ = '0.31.0' +__version__ = '0.31.1' requirement_constraints = {} here = abspath(dirname(__file__))