simpeg · sgkang · Oct 24, 2018 · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -13,22 +13,28 @@ sudo: false
 env:
   - TEST_DIR=tests
 
+addons:
+  apt_packages:
+    - gfortran
+
 before_install:
   - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
     -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     -O miniconda.sh; fi
   - chmod +x miniconda.sh
   - "./miniconda.sh -b -p $HOME/miniconda"
   - export PATH=$HOME/anaconda/bin:$HOME/miniconda/bin:$PATH
+  - export PYTHONPATH=$HOME/simpegEM1D:$PYTHONPATH
   - conda update --yes conda
 
 install:
   - conda env create -f environment.yml
   - source activate simpegEM1D-environment
-  - export MPLBACKEND="agg"
   - pip install -r requirements_dev.txt
   - pip install coveralls
   - python setup.py install
+  - make build
+  - export MPLBACKEND="agg"
 
 script:
   - travis_wait 20 nosetests $TEST_DIR -v -s

diff --git a/Makefile b/Makefile
@@ -1,7 +1,13 @@
-.PHONY: tests clean
+.PHONY: build tests clean deploy
+
+build:
+	python setup.py build_ext -i -b .
 
 tests:
     nosetests --logging-level=INFO
 
 clean:
-    find . -name "*.pyc" | xargs -I {} rm -v "{}"
+	find . -name "*.pyc" | xargs -I {} rm -v "{}"
+
+deploy:
+	python setup.py sdist bdist_wheel upload
diff --git a/environment.yml b/environment.yml
@@ -7,8 +7,9 @@ dependencies:
   - numpy
   - scipy
   - matplotlib
-  - ipywidgets
   - mkl
+  - gcc
   - pip:
     - pymatsolver
     - git+https://github.com/simpeg/simpegEM1D.git@master
+
diff --git a/notebooks/develop/Low_pass_filter.ipynb b/notebooks/develop/Low_pass_filter.ipynb
diff --git a/notebooks/develop/Test_global_em1d_inversion_booky.ipynb b/notebooks/develop/Test_global_em1d_inversion_booky.ipynb
@@ -1011,6 +1011,18 @@
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.6.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/develop/Test_global_em1d_inversion_booky_example.ipynb b/notebooks/develop/Test_global_em1d_inversion_booky_example.ipynb
diff --git a/notebooks/examples/EM1D_inversion_FD_height_correction.ipynb b/notebooks/examples/EM1D_inversion_FD_height_correction.ipynb
diff --git a/notebooks/examples/EM1D_inversion_FD_height_correction_halfspace.ipynb b/notebooks/examples/EM1D_inversion_FD_height_correction_halfspace.ipynb
diff --git a/notebooks/examples/EM1D_inversion_TD_layers.ipynb b/notebooks/examples/EM1D_inversion_TD_layers.ipynb
diff --git a/notebooks/examples/EM1D_inversion_TD_layers_dual_moment.ipynb b/notebooks/examples/EM1D_inversion_TD_layers_dual_moment.ipynb
diff --git a/notebooks/examples/Test_global_em1d_inversion.ipynb b/notebooks/examples/Test_global_em1d_inversion.ipynb
diff --git a/notebooks/examples/Test_global_em1d_inversion_td.ipynb b/notebooks/examples/Test_global_em1d_inversion_td.ipynb
diff --git a/setup.py b/setup.py
@@ -5,11 +5,10 @@
 simpegEM1D is the package for simulation and inversion of
 electromagnetic data using 1D layered-earth solution.
 """
-
-from distutils.core import setup
+import setuptools
+from numpy.distutils.core import setup, Extension
 from setuptools import find_packages
 
-
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Education',
@@ -29,24 +28,41 @@
 with open('README.md') as f:
     LONG_DESCRIPTION = ''.join(f.readlines())
 
+fExt = [Extension(name='simpegEM1D.m_rTE_Fortran', # Name of the package to import
+                  sources=['simpegEM1D/Fortran/m_rTE_Fortran.f90'],
+                #   extra_f90_compile_args=['-ffree-line-length-none',
+                #                       '-O3',
+                #                       '-finline-functions',
+                #                       '-funroll-all-loops',
+                #                       '-DNDEBUG',
+                #                       '-g0'],
+                  extra_link_args=['-ffree-line-length-none',
+                                      '-O3',
+                                      '-finline-functions',
+                                      '-funroll-all-loops',
+                                      '-g0'],
+                  )
+        ]
+
+
 setup(
-    name = 'simpegEM1D',
-    version = '0.0.13',
-    packages = find_packages(),
-    install_requires = [
+    name='simpegEM1D',
+    version='0.0.15',
+    packages=find_packages(),
+    install_requires=[
         'SimPEG>=0.4.1',
         'empymod>=1.6.2',
         'multiprocess'
     ],
-    author = 'Seogi Kang',
-    author_email = '[email protected]',
-    description = 'simpegEM1D',
-    long_description = LONG_DESCRIPTION,
-    keywords = 'geophysics, electromagnetics',
+    author='Seogi Kang',
+    author_email='[email protected]',
+    description='simpegEM1D',
+    long_description=LONG_DESCRIPTION,
+    keywords='geophysics, electromagnetics',
     url='https://github.com/simpeg/simpegEM1D',
     download_url='https://github.com/simpeg/simpegEM1D',
     classifiers=CLASSIFIERS,
-    platforms = ['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
+    platforms=['Windows', 'Linux', 'Solaris', 'Mac OS-X', 'Unix'],
     license='MIT License',
-    use_2to3 = False,
+    ext_modules=fExt
 )