revert rv dependencies to dev versions

Author: AdeelH

docs/release.rst

@@ -93,7 +93,7 @@ Minor or Major Version Release
 
     .. code-block:: console
 
-        scripts/pypi_build
+        scripts/build_packages
 
     Publish to TestPyPI:
 

pyproject.toml

@@ -27,17 +27,23 @@ keywords = [
     "raster",
 ]
 dependencies = [
-    "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",
+    "rastervision_pipeline @ file://${PROJECT_ROOT}/rastervision_pipeline/dist/rastervision_pipeline-0.31.2.dev0-py3-none-any.whl",
+    "rastervision_aws_s3 @ file://${PROJECT_ROOT}/rastervision_aws_s3/dist/rastervision_aws_s3-0.31.2.dev0-py3-none-any.whl",
+    "rastervision_aws_batch @ file://${PROJECT_ROOT}/rastervision_aws_batch/dist/rastervision_aws_batch-0.31.2.dev0-py3-none-any.whl",
+    "rastervision_core @ file://${PROJECT_ROOT}/rastervision_core/dist/rastervision_core-0.31.2.dev0-py3-none-any.whl",
+    "rastervision_pytorch_learner @ file://${PROJECT_ROOT}/rastervision_pytorch_learner/dist/rastervision_pytorch_learner-0.31.2.dev0-py3-none-any.whl",
+    "rastervision_pytorch_backend @ file://${PROJECT_ROOT}/rastervision_pytorch_backend/dist/rastervision_pytorch_backend-0.31.2.dev0-py3-none-any.whl",
 ]
 
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements.in"] }
+
 [project.optional-dependencies]
 debugging = []
-full = ["rastervision_aws_sagemaker==0.31.1", "rastervision_gdal_vsi==0.31.1"]
+full = [
+    "rastervision_aws_sagemaker @ file://${PROJECT_ROOT}/rastervision_aws_sagemaker/dist/rastervision_aws_sagemaker-0.31.2.dev0-py3-none-any.whl",
+    "rastervision_gdal_vsi @ file://${PROJECT_ROOT}/rastervision_gdal_vsi/dist/rastervision_gdal_vsi-0.31.2.dev0-py3-none-any.whl",
+]
 dev = [
     "awscli==1.33.40",
     "build",

rastervision_aws_batch/requirements.in

@@ -1,2 +1,2 @@
 boto3
-rastervision_pipeline==0.31.1
+rastervision_pipeline==0.31.2-dev

rastervision_aws_s3/requirements.in

@@ -1,4 +1,4 @@
 boto3
 botocore
-rastervision_pipeline==0.31.1
+rastervision_pipeline==0.31.2-dev
 tqdm

rastervision_aws_sagemaker/requirements.in

@@ -1,2 +1,2 @@
-rastervision_pipeline==0.31.1
+rastervision_pipeline==0.31.2-dev
 sagemaker

rastervision_core/requirements.in

@@ -7,7 +7,7 @@ pillow
 pyproj<=3.7.0
 pystac
 rasterio
-rastervision_pipeline==0.31.1
+rastervision_pipeline==0.31.2-dev
 scikit-image
 scikit-learn
 scipy

rastervision_gdal_vsi/requirements.in

@@ -1,2 +1,2 @@
 gdal==3.6.3
-rastervision_pipeline==0.31.1
+rastervision_pipeline==0.31.2-dev

rastervision_pytorch_backend/requirements.in

@@ -1,2 +1,2 @@
 boto3
-rastervision_pipeline==0.31.1
+rastervision_pipeline==0.31.2-dev

rastervision_pytorch_learner/requirements.in

@@ -7,8 +7,8 @@ opencv-python-headless
 pillow
 psutil
 pycocotools
-rastervision_core==0.31.1
-rastervision_pipeline==0.31.1
+rastervision_core==0.31.2-dev
+rastervision_pipeline==0.31.2-dev
 tensorboard
 torch
 torchvision

requirements.txt

@@ -58,6 +58,7 @@ boto3==1.34.155
     #   rastervision-aws-batch
     #   rastervision-aws-s3
     #   rastervision-core
+    #   rastervision-pytorch-backend
     #   sagemaker
 botocore==1.34.158
     # via
@@ -89,7 +90,6 @@ click==8.1.7
     #   cligj
     #   dask
     #   rasterio
-    #   rastervision-pipeline
 click-plugins==1.1.1
     # via rasterio
 cligj==0.7.2
@@ -106,8 +106,6 @@ comm==0.2.2
     # via
     #   ipykernel
     #   ipywidgets
-configobj==5.0.9
-    # via everett
 contourpy==1.3.1
     # via matplotlib
 coverage==7.2.0
@@ -140,8 +138,6 @@ docutils==0.16
     #   myst-parser
     #   nbsphinx
     #   sphinx
-everett==3.3.0
-    # via rastervision-pipeline
 executing==2.2.0
     # via stack-data
 fastjsonschema==2.21.1
@@ -564,7 +560,6 @@ pydantic==2.10.6
     #   albumentations
     #   autodoc-pydantic
     #   pydantic-settings
-    #   rastervision-pipeline
 pydantic-core==2.27.2
     # via pydantic
 pydantic-settings==2.8.1
@@ -654,7 +649,6 @@ requests==2.32.3
     #   jupyterlab-server
     #   moto
     #   pystac-client
-    #   rastervision-pipeline
     #   responses
     #   sagemaker
     #   sphinx
@@ -720,7 +714,6 @@ six==1.16.0
     # via
     #   google-pasta
     #   python-dateutil
-    #   rastervision-pipeline
     #   rfc3339-validator
     #   tensorboard
 smdebug-rulesconfig==1.0.1
@@ -824,7 +817,6 @@ tqdm==4.66.5
     #   rastervision-pytorch-learner (rastervision_pytorch_learner/pyproject.toml)
     #   rastervision-aws-s3
     #   rastervision-core
-    #   rastervision-pipeline
     #   rastervision-pytorch-learner
     #   sagemaker
 traitlets==5.14.3

scripts/pypi_build renamed to scripts/build_packages

@@ -27,7 +27,7 @@ function usage() {
 }
 
 # Check for command-line arguments
-if [[ "$1" == "--help" || "$1" == "-h" ]]; then
+if [[ ${1:-} == "--help" || ${1:-} == "-h" ]]; then
     usage
     exit
 fi

scripts/pypi_publish

@@ -67,14 +67,14 @@ function publish_all() {
 }
 
 # Check for command-line arguments
-if [[ "$1" == "--help" || "$1" == "-h" ]]; then
+if [[ ${1:-} == "--help" || ${1:-} == "-h" ]]; then
     usage
     exit
 fi
 
 # Check if the --test flag is passed
 publish_to_test=false
-if [[ "$1" == "--test" ]]; then
+if [[ ${1:-} == "--test" ]]; then
     publish_to_test=true
     # Remove the --test flag from the arguments
     shift
@@ -87,7 +87,7 @@ if [ "$publish_to_test" = true ]; then
 fi
 
 # If actually publishing: prompt for confirmation
-if [[ "$1" == "-y" ]]; then
+if [[ ${1:-} == "-y" ]]; then
     response="y"
 else
     read -r -p "Actually publish to PyPI? (y/N): " response

scripts/refresh_requirements.sh

@@ -12,6 +12,11 @@ while [ -h "$SOURCE" ]; do SOURCE="$(readlink "$SOURCE")"; done
 SCRIPTS_DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
 SRC_DIR="$(cd -P "$(dirname "$SCRIPTS_DIR")" && pwd)"
 
+# re-build package wheels
+echo "Rebuilding Raster Vision packages ..."
+"$SCRIPTS_DIR"/build_packages >/dev/null 2>/dev/null
+echo "Done"
+
 plugins=(
     "rastervision_pipeline"
     "rastervision_aws_batch"
@@ -32,6 +37,7 @@ done
 
 pushd "$SRC_DIR" >/dev/null
 
+echo "Compiling requirements ..."
 uv pip compile \
     --refresh --all-extras \
     "${toml_files[@]}" \