From 02d79217069d9187f696553f5089c447790ea36f Mon Sep 17 00:00:00 2001 From: Mark Messner Date: Tue, 19 Jan 2021 18:10:29 -0600 Subject: [PATCH 1/2] Fixed dependency issue (hopefully) with vtk on mac --- doc/sphinx/source/installation.rst | 21 +++++++++++++++++---- setup.py | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/doc/sphinx/source/installation.rst b/doc/sphinx/source/installation.rst index 3d9e1db..32f1e7f 100644 --- a/doc/sphinx/source/installation.rst +++ b/doc/sphinx/source/installation.rst @@ -14,14 +14,27 @@ Install using the pip package manager The easiest way to install the package is to use the `pip` package manager, installing srlife from pypi automatically. However, the neml source package requires compiling the module from source, which still has a few system-level dependencies. -Ubuntu Linux -"""""""""""" +Ubuntu Linux 18.04 +"""""""""""""""""" .. code-block:: console sudo apt install build-essential cmake libblas-dev liblapack-dev python3-dev python3-setuptools python3-pip python3-wheel pip3 install --user srlife +MacOS Sierra 10.14 Mojave +""""""""""""""""""""""""" + +Go to `brew.sh `_ and follow the directions to install homebrew. + +Open up a terminal and run: + +.. code-block:: console + + brew install cmake openblas superlu python vtk + pip3 install --user srlife + +`srlife` will then be available as a package through the homebrew version of python (often available as `python3` instead of `python`). Install from the github repository directly ------------------------------------------- @@ -31,8 +44,8 @@ to also obtain the tutorial, example, and test files you can install the package directly from `github `_. In addition to the, cmake, BLAS, and LAPACK requirements you will need git and, optionally, the nose package to automatically run the tests. -Ubuntu Linux -"""""""""""" +Ubuntu Linux 18.04 +"""""""""""""""""" The following installs the prerequisites, downloads srlife, sets up the python package, and runs the automated test suite. diff --git a/setup.py b/setup.py index 3df5a9e..d067a91 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ 'numpy==1.18', 'scipy', 'h5py', - 'vtk', + 'vtk ; platform_system!="Darwin"', 'nose', 'matplotlib', 'pylint', From 9fa8cc440acfebc6ba9fbff47c57e8242304572a Mon Sep 17 00:00:00 2001 From: Mark Messner Date: Tue, 19 Jan 2021 18:11:11 -0600 Subject: [PATCH 2/2] Incremented version --- doc/sphinx/source/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 24c0820..53214b4 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -22,7 +22,7 @@ author = 'Argonne National Laboratory' # The full version, including alpha/beta/rc tags -release = '1.0.2' +release = '1.0.3' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index d067a91..a3cd9fd 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ # Name of the project name = 'srlife', # Version - version = '1.0.2', + version = '1.0.3', # One line-description description = "Evaluate the structural life of a solar receiver", # README