Merge branch 'rgieseke-py3-compatibility'

.travis.yml

@@ -3,6 +3,7 @@ dist: trusty
 sudo: required
 python:
   - "2.7"
+  - "3.6"
 before_install:
   - pip install pytest
 install:

fair/__init__.py

@@ -6,7 +6,7 @@
 
 
 # # # ------------ IMPORT REQUIRED MODULES ------------ # # #
-import forward
+from . import forward
 from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions

fair/forward.py

@@ -1,10 +1,10 @@
 import inspect
 import numpy as np
 from scipy.optimize import root
-from constants import molwt, lifetime, radeff
-from constants.general import M_ATMOS
-from forcing import ozone_tr, ozone_st, h2o_st, contrails, aerosols, bc_snow,\
-                    landuse
+from .constants import molwt, lifetime, radeff
+from .constants.general import M_ATMOS
+from .forcing import ozone_tr, ozone_st, h2o_st, contrails, aerosols, bc_snow,\
+                     landuse
 
 def iirf_interp_funct(alp_b,a,tau,targ_iirf):
 	# ref eq. (7) of Millar et al ACP (2017)
@@ -89,9 +89,9 @@ def fair_scm(emissions=False,
       lifetimes = lifetime.aslist
     # Select the desired GHG forcing relationship
     if ghg_forcing.lower()=="etminan":
-      from forcing.ghg import etminan as ghg
+      from .forcing.ghg import etminan as ghg
     elif ghg_forcing.lower()=="myhre":
-      from forcing.ghg import myhre as ghg
+      from .forcing.ghg import myhre as ghg
     else:
       raise ValueError("ghg_forcing should be 'etminan' (default) or 'myhre'")
 

index.ipynb

@@ -69,7 +69,7 @@
     "from matplotlib import pyplot as plt\n",
     "plt.style.use('seaborn-darkgrid')\n",
     "plt.rcParams['figure.figsize'] = 16, 9\n",
-    "print plt.style"
+    "print(plt.style)"
    ]
   },
   {