From 5c19d66db30808179e4b2b2ee574feaebb60bc58 Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <shoyer@google.com>
Date: Fri, 6 Dec 2024 17:10:37 -0800
Subject: [PATCH] Fix required dependencies

Also release dinosaur=1.1.1.

PiperOrigin-RevId: 703659433
---
 .github/workflows/ci-build.yml |  2 +-
 dinosaur/__init__.py           |  2 +-
 pyproject.toml                 | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 60e5af4..5a91129 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -40,7 +40,7 @@ jobs:
         key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
     - name: Install Dinosaur
       run: |
-        pip install -e .[tests,xarray-utils]
+        pip install -e .[tests]
     - name: Run unit tests
       # TODO(shoyer): re-enable regrid_test once we figure out how to install Beam on GitHub actions
       run: |
diff --git a/dinosaur/__init__.py b/dinosaur/__init__.py
index 2074725..f3f7760 100644
--- a/dinosaur/__init__.py
+++ b/dinosaur/__init__.py
@@ -35,4 +35,4 @@
 import dinosaur.weatherbench_utils
 import dinosaur.xarray_utils
 
-__version__ = "1.1.0"  # keep sync with pyproject.toml
+__version__ = "1.1.1"  # keep sync with pyproject.toml
diff --git a/pyproject.toml b/pyproject.toml
index 63b75a2..aa17b6b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ package-data = {"dinosaur.data" = ["*"]}
 
 [project]
 name = "dinosaur-dycore"
-version = "1.1.0"  # keep sync with __init__.py
+version = "1.1.1"  # keep sync with __init__.py
 authors = [
     {name = "Google LLC", email = "noreply@google.com"},
 ]
@@ -24,6 +24,14 @@ dependencies = [
     "scipy",
     "scikit-learn",
     "tree-math",
+    # these packages below are only required for xarray-utils, and really
+    # should not be required by default.
+    "dask",
+    "fsspec",
+    "pandas",
+    "xarray",
+    # "xarray-beam",  # TODO(shoyer): figure out how to install Beam in CI
+    "xarray-tensorstore",
 ]
 
 [project.optional-dependencies]
@@ -32,11 +40,3 @@ tests = [
     "chex",
     "pytest",
 ]
-xarray-utils = [
-    "dask",
-    "fsspec",
-    "pandas",
-    "xarray",
-    # "xarray-beam",  # TODO(shoyer): figure out how to install Beam in CI
-    "xarray-tensorstore",
-]