Skip to content

Commit

Permalink
Merge pull request USEPA#396 from kaklise/setuptools
Browse files Browse the repository at this point in the history
Added setuptools and removed readthedocs config
  • Loading branch information
kaklise authored Dec 18, 2023
2 parents 7c5a6a0 + 9c86044 commit db83fb7
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
1 change: 1 addition & 0 deletions documentation/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
5 changes: 0 additions & 5 deletions readthedocs.yml

This file was deleted.

1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ scipy
networkx
pandas
matplotlib
setuptools

# Optional
plotly<=5.11.0
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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__))
Expand Down

0 comments on commit db83fb7

Please sign in to comment.