From bece9d269c5cc3e39eb5faeedd86733c6300daa5 Mon Sep 17 00:00:00 2001
From: Dan Holdaway <27729500+danholdaway@users.noreply.github.com>
Date: Mon, 11 Dec 2023 12:34:40 -0500
Subject: [PATCH] Update requirements for latest spack stack (#168)

Co-authored-by: danholdaway <danholdaway@users.noreply.github.com>
---
 .gitignore                     |  1 +
 requirements-spackstack1.4.txt | 25 -------------------------
 requirements.txt               |  5 +++++
 setup.py                       |  2 +-
 4 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 requirements-spackstack1.4.txt

diff --git a/.gitignore b/.gitignore
index 4830b678..ae9a526b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,4 @@ dmypy.json
 # Swap files
 *.swp
 *.swo
+._*
diff --git a/requirements-spackstack1.4.txt b/requirements-spackstack1.4.txt
deleted file mode 100644
index 3cb461b3..00000000
--- a/requirements-spackstack1.4.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# Packages in spack stack
-setuptools==59.4.0
-pyyaml==6.0
-pycodestyle==2.8.0
-netCDF4==1.5.3
-matplotlib==3.7.1
-cartopy==0.21.1
-scipy==1.9.3
-xarray==2022.3.0
-pandas==1.4.0
-numpy==1.22.3
-
-# Not explicitly part of eva but dependcies of eva dependencies already in spack-stack
-# versions need to be set to avoid other versions being picked
-pyproj==3.1.0
-importlib-metadata==4.8.2
-
-# Additional packages
-git+https://github.com/NOAA-EMC/emcpy.git@9b6756341e9ae963baa7d3a256b8ada3da688d04#egg=emcpy
-scikit-learn
-seaborn
-hvplot
-nbconvert
-bokeh
-geopandas
diff --git a/requirements.txt b/requirements.txt
index e46c37ed..e6cd7194 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,11 @@ xarray>=2022.3.0
 pandas>=1.4.0
 numpy>=1.22.3
 
+# Not explicitly part of eva but dependcies of eva dependencies already in spack-stack
+# versions need to be set to avoid other versions being picked
+pyproj==3.1.0
+importlib-metadata==4.8.2
+
 # Additional packages
 git+https://github.com/NOAA-EMC/emcpy.git@9b6756341e9ae963baa7d3a256b8ada3da688d04#egg=emcpy
 scikit-learn
diff --git a/setup.py b/setup.py
index 1b9dfa2b..801b10a3 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 
 setuptools.setup(
     name='eva',
-    version='1.6.0',
+    version='1.6.1',
     author='Community owned code',
     description='Evaluation and Verification of an Analysis',
     url='https://github.com/JCSDA-internal/eva',