From da8dfd47e140d2ac39f0b4432396e4751417faa0 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Tue, 17 Dec 2024 18:01:49 -0700
Subject: [PATCH] Fix typo in configs/common/packages.yaml

---
 configs/common/packages.yaml | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 0da2f9597..a94ca5aa0 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -228,35 +228,11 @@ packages:
     require: '~mpi'
   # https://github.com/JCSDA/spack-stack/issues/1276
   py-matplotlib:
-     require: '@3.7.4'
-<<<<<<< Updated upstream
-=======
-  #py-meson-python:
-  #   require: '@0.15.0'
->>>>>>> Stashed changes
+    require: '@3.7.4'
   # Variant ~mpi not working for latest py-netcdf4
   # https://github.com/spack/spack/issues/47652
   py-netcdf4:
     require: '@1.7.1 +mpi'
-<<<<<<< Updated upstream
-  py-pandas:
-    require: '+excel'
-=======
-  # py-numpy@1.26 causes many build problems with older Python packages
-  # also check Nautilus site config when making changes here
-  # https://github.com/JCSDA/spack-stack/issues/1276
-  #py-numpy:
-  #  require:
-  #  - '@:1.23.5'
-  # Sigh, it's complicated. With py-cython@3 (needed to avoid duplicate packages),
-  # pandas must be 2.2 or later. For those versions, the +excel variant adds dependencies
-  # on py-python-calamina, py-maturin, and rust (full rust, not just rust-bootstrap).
-  # @climbfuji thinks we can live without the excel variant ...
-  #py-pandas:
-  #  require: '+excel'
-  #py-pybind11:
-  #  require: '@2.11.0'
->>>>>>> Stashed changes
   # To avoid duplicate packages
   py-ruamel-yaml:
     require: '@0.17.16'