Merge pull request #114 from brian-rose/fix_build

Get the builds working again on all platforms.

ci/requirements-py27-osx.yml

@@ -1,5 +1,6 @@
 name: test_env
 channels:
+  - defaults
   - conda-forge
 dependencies:
   - python=2.7
@@ -8,7 +9,8 @@ dependencies:
   - xarray
   - numpy
   - scipy
-  - fortran-compiler
+  - gfortran_osx-64
+  - libgfortran
   - future
   - attrdict
   - requests

ci/requirements-py36-osx.yml

@@ -1,5 +1,6 @@
 name: test_env
 channels:
+  - defaults
   - conda-forge
 dependencies:
   - python=3.6
@@ -8,7 +9,8 @@ dependencies:
   - xarray
   - numpy
   - scipy
-  - fortran-compiler
+  - gfortran_osx-64
+  - libgfortran
   - future
   - attrdict
   - requests

ci/requirements-py37-osx.yml

@@ -1,5 +1,6 @@
 name: test_env
 channels:
+  - defaults
   - conda-forge
 dependencies:
   - python=3.7
@@ -8,7 +9,8 @@ dependencies:
   - xarray
   - numpy
   - scipy
-  - fortran-compiler
+  - gfortran_osx-64
+  - libgfortran
   - future
   - attrdict
   - requests

climlab/__init__.py

@@ -7,7 +7,7 @@
 has been documented for a comprehensive understanding and traceability.
 '''
 
-__version__ = '0.7.5'
+__version__ = '0.7.6.dev0'
 
 # this should ensure that we can still import constants.py as climlab.constants
 from .utils import constants, thermo, legendre

conda-recipe/build.sh

@@ -10,9 +10,13 @@ if [[ `uname` == 'Darwin' ]]; then
     # Also, included a workaround so that `-stdlib=c++` doesn't go to
     # `gfortran` and cause problems.
     #
-    # https://github.com/conda-forge/toolchain-feedstock/pull/8
+    # https://github.com/conda-forge/toolchain-feedstock/pull/8export CFLAGS="${CFLAGS} -stdlib=libc++ -lc++"
     export CFLAGS="${CFLAGS} -stdlib=libc++ -lc++"
     export LDFLAGS="-headerpad_max_install_names -undefined dynamic_lookup -bundle -Wl,-search_paths_first -lc++"
+    # conda compilers need the MacOSX10.9 SDK and need to be told where they are
+    # https://www.anaconda.com/utilizing-the-new-compilers-in-anaconda-distribution-5/
+    # Other uses may need to update this if they install MacOSX10.9.sdk somewhere else
+    export CONDA_BUILD_SYSROOT=$HOME/opt/MacOSX10.9.sdk
 else
     unset LDFLAGS
 fi

conda-recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "0.7.5" %}
+{% set version = "0.7.6.dev0" %}
 
 package:
   name: climlab
@@ -18,6 +18,7 @@ requirements:
   host:
     - flang  # [win and py3k]
     - python
+    - setuptools
     - pip
     - numpy
   run:
@@ -26,7 +27,7 @@ requirements:
     - libflang  # [win and py3k]
     - scipy
     - pydap
-    - urllib3
+    - requests
     - xarray
     - future
     - attrdict
@@ -39,7 +40,7 @@ test:
   imports:
     - climlab
   commands:
-    - pytest -v -m fast --pyargs climlab.tests --cov=climlab --cov-config .coveragerc --cov-report term-missing -v
+    - pytest -v --pyargs climlab.tests --cov=climlab --cov-config .coveragerc --cov-report term-missing -v
     - codecov
 
 about:

setup.py

@@ -1,6 +1,6 @@
 import os
 
-VERSION = '0.7.5'
+VERSION = '0.7.6.dev0'
 
 # BEFORE importing setuptools, remove MANIFEST. Otherwise it may not be
 # properly updated when the contents of directories change (true for distutils,