From 9c860442bfbf6de36c63dddcf51a820a7e91caf5 Mon Sep 17 00:00:00 2001
From: Katherine Klise <kaklise@sandia.gov>
Date: Tue, 12 Dec 2023 10:29:25 -0800
Subject: [PATCH] Added setuptools to required packages, removed readthedocs
 yml and env variable

---
 documentation/installation.rst | 1 +
 readthedocs.yml                | 5 -----
 requirements.txt               | 1 +
 setup.py                       | 5 +----
 4 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 readthedocs.yml

diff --git a/documentation/installation.rst b/documentation/installation.rst
index bad11de5a..ebc08144c 100644
--- a/documentation/installation.rst
+++ b/documentation/installation.rst
@@ -249,6 +249,7 @@ Users should have experience using Python (https://www.python.org/), including t
   http://pandas.pydata.org/
 * Matplotlib :cite:p:`hunt07`: used to produce graphics, 
   http://matplotlib.org/
+* Setuptools: used to install the WNTR package, https://setuptools.pypa.io/
   
 These packages are included in the Anaconda Python distribution.
  
diff --git a/readthedocs.yml b/readthedocs.yml
deleted file mode 100644
index 86e22fbc0..000000000
--- a/readthedocs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-conda:
-    file: documentation/environment.yml
-python:
-    version: 3.7
-    setup_py_install: true
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index b719f3ed8..8118684b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@ scipy
 networkx
 pandas
 matplotlib
+setuptools
 
 # Optional
 plotly<=5.11.0
diff --git a/setup.py b/setup.py
index f7d2da495..0ae9e1510 100644
--- a/setup.py
+++ b/setup.py
@@ -7,12 +7,9 @@
 use_swig = False
 build = True
 
-# BUILD_WNTR_EXTENSIONS is defined as an environment variable for the project at readthedocs.org
 if '--no-build' in sys.argv:
     build = False
     sys.argv.remove('--no-build')
-elif 'BUILD_WNTR_EXTENSIONS' in os.environ and os.environ['BUILD_WNTR_EXTENSIONS'].lower() == 'false':
-    build = False
 
 extension_modules = list()
 if build:
@@ -75,7 +72,7 @@
 MAINTAINER_EMAIL = 'kaklise@sandia.gov'
 LICENSE = 'Revised BSD'
 URL = 'https://github.com/USEPA/WNTR'
-DEPENDENCIES = ['numpy>=1.21', 'scipy', 'networkx', 'pandas', 'matplotlib']
+DEPENDENCIES = ['numpy>=1.21', 'scipy', 'networkx', 'pandas', 'matplotlib', 'setuptools']
 
 # use README file as the long description
 file_dir = os.path.abspath(os.path.dirname(__file__))