From 2cfca1fbb212588c6662ea12f10d0f3beb8271cb Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Tue, 3 Nov 2015 14:24:49 +0000 Subject: [PATCH] Removed autodoc of source code for now. --- docs/requirements.txt | 1 - docs/source/conf.py | 2 +- docs/source/index.rst | 3 +-- oldsetup.py => setup.py | 8 +++----- 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 docs/requirements.txt rename oldsetup.py => setup.py (96%) diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index 296d6545..00000000 --- a/docs/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -numpy \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py index f484009e..ac91ab15 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -33,7 +33,7 @@ extensions = [ ] # autodoc mock imports -autodoc_mock_imports = ['h5py', 'matplotlib', 'pyfiglet', 'cython', 'psutil'] +#autodoc_mock_imports = ['h5py', 'matplotlib', 'pyfiglet', 'cython', 'psutil'] # Options for autodoc autodoc_default_flags = ['members'] diff --git a/docs/source/index.rst b/docs/source/index.rst index aa54b8fe..5f1aacab 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -34,5 +34,4 @@ gprMax User Guide :maxdepth: 2 :caption: Appendices - app_waveforms - app_source \ No newline at end of file + app_waveforms \ No newline at end of file diff --git a/oldsetup.py b/setup.py similarity index 96% rename from oldsetup.py rename to setup.py index 1522fec3..7ea2bbc7 100644 --- a/oldsetup.py +++ b/setup.py @@ -33,11 +33,9 @@ import glob, os, re, shutil, sys packagename = 'gprMax' # Read version number from gprMax/gprMax.py -#version = re.search('^__version__\s*=\s*\'(.*)\'', -# open(os.path.join(packagename, 'gprMax.py')).read(), -# re.M).group(1) - -version = '3.0.0b4' +version = re.search('^__version__\s*=\s*\'(.*)\'', + open(os.path.join(packagename, 'gprMax.py')).read(), + re.M).group(1) # Mac OS X - need to install gcc (via HomeBrew) and set it to be used. This is required because the default compiler LLVM (clang) does not support OpenMP if sys.platform == 'darwin':