From 81f1ac1ace4e00d9e57f6645993f153c27013a5c Mon Sep 17 00:00:00 2001
From: adam <athornton@lsst.org>
Date: Fri, 19 Jan 2024 11:20:57 -0700
Subject: [PATCH 1/2] Fix import

---
 giftless/storage/google_cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/giftless/storage/google_cloud.py b/giftless/storage/google_cloud.py
index e58772e..eba6332 100644
--- a/giftless/storage/google_cloud.py
+++ b/giftless/storage/google_cloud.py
@@ -9,7 +9,7 @@
 from typing import Any, BinaryIO, cast
 
 import google.auth
-import google.cloud
+import google.cloud.storage
 from google.auth import impersonated_credentials
 from google.oauth2 import service_account
 

From bd6f17cf63ab4c9595845010d046d672b65bec35 Mon Sep 17 00:00:00 2001
From: adam <athornton@lsst.org>
Date: Fri, 19 Jan 2024 12:06:05 -0700
Subject: [PATCH 2/2] Test on all of 3.10-3.12; remove unused
 google-storage-mock

---
 .github/workflows/ci.yaml |  6 ++++--
 pyproject.toml            |  2 +-
 requirements/dev.in       |  2 --
 requirements/dev.txt      | 41 +--------------------------------------
 4 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 20eedbe..1a2e476 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,7 +38,9 @@ jobs:
     strategy:
       matrix:
         python:
+          - "3.10"
           - "3.11"
+          - "3.12"
 
     steps:
       - uses: actions/checkout@v4
@@ -87,7 +89,7 @@ jobs:
       - name: Build and publish
         uses: lsst-sqre/build-and-publish-to-pypi@v2
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           upload: false
 
   pypi:
@@ -114,4 +116,4 @@ jobs:
       - name: Build and publish
         uses: lsst-sqre/build-and-publish-to-pypi@v2
         with:
-          python-version: "3.11"
+          python-version: "3.12"
diff --git a/pyproject.toml b/pyproject.toml
index 04cdf24..8254fa7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -213,7 +213,7 @@ ignore = [
     "ISC002",
 ]
 select = ["ALL"]
-target-version = "py310"
+target-version = "py310"  # Leave at the lowest supported version.
 
 [tool.ruff.per-file-ignores]
 "tests/**" = [
diff --git a/requirements/dev.in b/requirements/dev.in
index d1239a5..f8305f0 100644
--- a/requirements/dev.in
+++ b/requirements/dev.in
@@ -10,8 +10,6 @@ pytest-env
 pytest-cov
 pytest-vcr
 
-cloud-storage-mocker
-
 pytz
 types-pytz
 types-jwt
diff --git a/requirements/dev.txt b/requirements/dev.txt
index ae10b02..6ced793 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --no-emit-index-url --output-file=requirements/dev.txt requirements/dev.in
@@ -39,8 +39,6 @@ click==8.1.7
     # via
     #   -c requirements/main.txt
     #   pip-tools
-cloud-storage-mocker==0.3.1
-    # via -r requirements/dev.in
 colorama==0.4.6
     # via tox
 commonmark==0.9.1
@@ -64,41 +62,12 @@ flake8==7.0.0
     # via -r requirements/dev.in
 furo==2023.9.10
     # via -r requirements/dev.in
-google-api-core==2.15.0
-    # via
-    #   -c requirements/main.txt
-    #   google-cloud-core
-    #   google-cloud-storage
 google-auth==2.26.2
     # via
     #   -c requirements/main.txt
-    #   google-api-core
     #   google-auth-stubs
-    #   google-cloud-core
-    #   google-cloud-storage
 google-auth-stubs==0.2.0
     # via -r requirements/dev.in
-google-cloud-core==2.4.1
-    # via
-    #   -c requirements/main.txt
-    #   google-cloud-storage
-google-cloud-storage==2.14.0
-    # via
-    #   -c requirements/main.txt
-    #   cloud-storage-mocker
-google-crc32c==1.5.0
-    # via
-    #   -c requirements/main.txt
-    #   google-cloud-storage
-    #   google-resumable-media
-google-resumable-media==2.7.0
-    # via
-    #   -c requirements/main.txt
-    #   google-cloud-storage
-googleapis-common-protos==1.62.0
-    # via
-    #   -c requirements/main.txt
-    #   google-api-core
 grpc-stubs==1.53.0.5
     # via google-auth-stubs
 grpcio==1.60.0
@@ -148,11 +117,6 @@ pluggy==1.3.0
     # via
     #   pytest
     #   tox
-protobuf==4.25.2
-    # via
-    #   -c requirements/main.txt
-    #   google-api-core
-    #   googleapis-common-protos
 pyasn1==0.5.1
     # via
     #   -c requirements/main.txt
@@ -203,8 +167,6 @@ recommonmark==0.7.1
 requests==2.31.0
     # via
     #   -c requirements/main.txt
-    #   google-api-core
-    #   google-cloud-storage
     #   sphinx
 rsa==4.9
     # via
@@ -258,7 +220,6 @@ types-s3transfer==0.10.0
 typing-extensions==4.9.0
     # via
     #   -c requirements/main.txt
-    #   boto3-stubs
     #   mypy
 urllib3==2.0.7
     # via