From e5e58f6dfe890bfacf519268da50c34ae8296103 Mon Sep 17 00:00:00 2001
From: Andrew Simms <andrew.simms@nrel.gov>
Date: Fri, 27 Oct 2023 14:44:44 -0600
Subject: [PATCH 1/3] Fix: import fails due to pytest ModuleNotFoundError

`import pecos` currently fails due to `pytest` being called on this line: https://github.com/sandialabs/pecos/blob/e0aea99535f92f6f63f38387a79898ccb6966f37/pecos/graphics.py#L423

This commit moves pytest up to the required section which allows pytest to be installed during the `pip` installation step.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ebf4d74..8289ac9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@ pandas
 numpy
 jinja2
 matplotlib
+pytest
 
 # Optional
 pvlib
@@ -15,5 +16,4 @@ sphinx
 sphinx_rtd_theme
 
 # Testing
-pytest
 coverage
\ No newline at end of file

From c40a2a7af27d59e83e3aec770402d9f05b1047eb Mon Sep 17 00:00:00 2001
From: Andrew Simms <andrew.simms@nrel.gov>
Date: Fri, 27 Oct 2023 15:42:36 -0600
Subject: [PATCH 2/3] Fix: Add pytest to setup.py installation requirements

Require installation of `pytest` on pip installation of pecos. Should fix: https://github.com/sandialabs/pecos/issues/79
---
 requirements.txt | 3 ++-
 setup.py         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8289ac9..b73201e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ pandas
 numpy
 jinja2
 matplotlib
-pytest
+
 
 # Optional
 pvlib
@@ -16,4 +16,5 @@ sphinx
 sphinx_rtd_theme
 
 # Testing
+pytest
 coverage
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 6e356a0..927458e 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,8 @@
     'install_requires': ['numpy >= 1.10.4',
                          'pandas >= 0.18.0',
                          'matplotlib',
-                         'jinja2'],
+                         'jinja2'
+                         'pytest'],
     'scripts': [],
     'include_package_data': True
 }

From 65bc69a782bc81a9dd5ab88e69250068ddc8b1ee Mon Sep 17 00:00:00 2001
From: Katherine Klise <kaklise@sandia.gov>
Date: Fri, 27 Oct 2023 15:48:22 -0700
Subject: [PATCH 3/3] Added comma

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 927458e..fada790 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
     'install_requires': ['numpy >= 1.10.4',
                          'pandas >= 0.18.0',
                          'matplotlib',
-                         'jinja2'
+                         'jinja2',
                          'pytest'],
     'scripts': [],
     'include_package_data': True