From 45c25365d905ea593871499eca0dd2c9241d720f Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Wed, 5 Feb 2014 13:13:06 -0800 Subject: [PATCH 1/3] Error in testing init file. --- simpegEM/Tests/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/simpegEM/Tests/__init__.py b/simpegEM/Tests/__init__.py index 32112042..420388ef 100644 --- a/simpegEM/Tests/__init__.py +++ b/simpegEM/Tests/__init__.py @@ -1,10 +1,8 @@ -from TestUtils import checkDerivative, Rosenbrock, OrderTest, getQuadratic - +import os +import glob +import unittest if __name__ == '__main__': - import os - import glob - import unittest test_file_strings = glob.glob('test_*.py') module_strings = [str[0:len(str)-3] for str in test_file_strings] suites = [unittest.defaultTestLoader.loadTestsFromName(str) for str From efc28e725198fcde741d56553442ac5c885424f6 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Wed, 5 Feb 2014 13:14:38 -0800 Subject: [PATCH 2/3] __inti__.py --> __init__.py --- simpegEM/FDEM/{__inti__.py => __init__.py} | 0 simpegEM/TDEM/{__inti__.py => __init__.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename simpegEM/FDEM/{__inti__.py => __init__.py} (100%) rename simpegEM/TDEM/{__inti__.py => __init__.py} (100%) diff --git a/simpegEM/FDEM/__inti__.py b/simpegEM/FDEM/__init__.py similarity index 100% rename from simpegEM/FDEM/__inti__.py rename to simpegEM/FDEM/__init__.py diff --git a/simpegEM/TDEM/__inti__.py b/simpegEM/TDEM/__init__.py similarity index 100% rename from simpegEM/TDEM/__inti__.py rename to simpegEM/TDEM/__init__.py From d9df40b5be0506bafe4bd9fc086b6b92b0677390 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Wed, 5 Feb 2014 13:48:54 -0800 Subject: [PATCH 3/3] Try setup.py for RTD --- setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..95fb3b72 --- /dev/null +++ b/setup.py @@ -0,0 +1,8 @@ +import os +try: + import SimPEG +except ImportError, e: + os.system('git clone https://github.com/simpeg/simpeg.git') + os.system('mv simpeg/SimPEG temp') + os.system('rm -rf simpeg') + os.system('mv temp SimPEG')