From ec576671472a72b08e936589e9afd759d8eff640 Mon Sep 17 00:00:00 2001
From: Stelios Voutsinas <steliosvoutsinas@yahoo.com>
Date: Wed, 16 Oct 2024 15:08:06 -0700
Subject: [PATCH] Fix reqs for s3 and direct Butler

---
 requirements/main.in  |  5 +++-
 requirements/main.txt | 70 +++++++++++++++++++++++++++++++++++++++++--
 requirements/tox.txt  |  4 ++-
 3 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/requirements/main.in b/requirements/main.in
index 7690bc0..7e56fc7 100644
--- a/requirements/main.in
+++ b/requirements/main.in
@@ -14,6 +14,8 @@ uvicorn[standard]
 python-multipart
 
 # Other dependencies.
+boto3
+google-cloud-storage
 requests
 jinja2
 pydantic
@@ -24,5 +26,6 @@ numpy
 astropy
 vo-models
 defusedxml
-lsst-daf-butler[remote]
+lsst-daf-butler[postgres,remote]
+lsst-resources[s3,gs]
 lsst-dax-obscore @ git+https://github.com/lsst-dm/dax_obscore@main#egg=lsst-dax-obscore
diff --git a/requirements/main.txt b/requirements/main.txt
index 3209ec2..3ade65e 100644
--- a/requirements/main.txt
+++ b/requirements/main.txt
@@ -16,6 +16,18 @@ astropy==6.1.4
     #   lsst-utils
 astropy-iers-data==0.2024.10.14.0.32.55
     # via astropy
+backoff==2.2.1
+    # via lsst-resources
+boto3==1.35.42
+    # via
+    #   -r requirements/main.in
+    #   lsst-resources
+botocore==1.35.42
+    # via
+    #   boto3
+    #   s3transfer
+cachetools==5.5.0
+    # via google-auth
 certifi==2024.8.30
     # via
     #   httpcore
@@ -51,6 +63,29 @@ fastapi==0.115.2
     #   safir
 gidgethub==5.3.0
     # via safir
+google-api-core==2.21.0
+    # via
+    #   google-cloud-core
+    #   google-cloud-storage
+google-auth==2.35.0
+    # via
+    #   google-api-core
+    #   google-cloud-core
+    #   google-cloud-storage
+google-cloud-core==2.4.1
+    # via google-cloud-storage
+google-cloud-storage==2.18.2
+    # via
+    #   -r requirements/main.in
+    #   lsst-resources
+google-crc32c==1.6.0
+    # via
+    #   google-cloud-storage
+    #   google-resumable-media
+google-resumable-media==2.7.2
+    # via google-cloud-storage
+googleapis-common-protos==1.65.0
+    # via google-api-core
 greenlet==3.1.1
     # via sqlalchemy
 h11==0.14.0
@@ -61,7 +96,7 @@ hpgeom==1.4.0
     # via lsst-sphgeom
 httpcore==1.0.6
     # via httpx
-httptools==0.6.2
+httptools==0.6.4
     # via uvicorn
 httpx==0.27.2
     # via
@@ -74,6 +109,10 @@ idna==3.10
     #   requests
 jinja2==3.1.4
     # via -r requirements/main.in
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
 lsst-daf-butler==27.2024.4100
     # via
     #   -r requirements/main.in
@@ -86,6 +125,7 @@ lsst-felis==27.2024.4100
     # via lsst-dax-obscore
 lsst-resources==27.2024.4100
     # via
+    #   -r requirements/main.in
     #   lsst-daf-butler
     #   lsst-dax-obscore
 lsst-sphgeom==27.2024.3700
@@ -115,14 +155,29 @@ numpy==2.1.2
     #   pyerfa
 packaging==24.1
     # via astropy
+proto-plus==1.24.0
+    # via google-api-core
+protobuf==5.28.2
+    # via
+    #   google-api-core
+    #   googleapis-common-protos
+    #   proto-plus
 psutil==6.0.0
     # via lsst-utils
-psycopg2-binary==2.9.9
+psycopg2==2.9.10
+    # via lsst-daf-butler
+psycopg2-binary==2.9.10
     # via -r requirements/main.in
 pyarrow==17.0.0
     # via
     #   lsst-daf-butler
     #   lsst-dax-obscore
+pyasn1==0.6.1
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.4.1
+    # via google-auth
 pycparser==2.22
     # via cffi
 pydantic==2.9.2
@@ -149,6 +204,8 @@ pyerfa==2.0.1.4
     # via astropy
 pyjwt==2.9.0
     # via gidgethub
+python-dateutil==2.9.0.post0
+    # via botocore
 python-dotenv==1.0.1
     # via
     #   pydantic-settings
@@ -166,11 +223,19 @@ pyyaml==6.0.2
 requests==2.32.3
     # via
     #   -r requirements/main.in
+    #   google-api-core
+    #   google-cloud-storage
     #   lsst-resources
+rsa==4.9
+    # via google-auth
+s3transfer==0.10.3
+    # via boto3
 safir==6.4.0
     # via -r requirements/main.in
 safir-logging==6.4.0
     # via safir
+six==1.16.0
+    # via python-dateutil
 sniffio==1.3.1
     # via
     #   anyio
@@ -202,6 +267,7 @@ uritemplate==4.1.1
     # via gidgethub
 urllib3==2.2.3
     # via
+    #   botocore
     #   lsst-resources
     #   requests
 uvicorn==0.32.0
diff --git a/requirements/tox.txt b/requirements/tox.txt
index 33e5af6..f353da6 100644
--- a/requirements/tox.txt
+++ b/requirements/tox.txt
@@ -1,7 +1,9 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --output-file requirements/tox.txt requirements/tox.in
 cachetools==5.5.0
-    # via tox
+    # via
+    #   -c requirements/main.txt
+    #   tox
 chardet==5.2.0
     # via tox
 colorama==0.4.6