Merge branch 'support-python3'.

Add support for Python 3.4, 3.5, 3.6, stay compatible with 2.7.
Test all supported versions on travis with conda.
Test Python 2.7 with Linux system Python and
Python 3.6 with homebrew Python on Mac OS X.

This closes #10.

Author: pavoljuhas

.travis.yml

@@ -8,13 +8,11 @@ os:
 
 env:
   - MYUSEMC=true MYPYTHON_VERSION=2.7
+  - MYUSEMC=true MYPYTHON_VERSION=3.4
+  - MYUSEMC=true MYPYTHON_VERSION=3.5
+  - MYUSEMC=true MYPYTHON_VERSION=3.6
   - MYUSEMC=false
 
-matrix:
-  exclude:
-    - os: osx
-      env: MYUSEMC=false
-
 git:
   depth: 999999
 
@@ -26,10 +24,17 @@ before_install:
   - MYNAME=pyobjcryst
   - umask 022
   - git fetch origin --tags
+  - MYPYTHON=python; MYPIP=pip
+  - NOAPT=true; NOBREW=true; NOMC=true
   - if ${MYUSEMC}; then
-        NOAPT=true; NOMC=false;
-    else
-        NOAPT=false; NOMC=true;
+        NOMC=false;
+    elif [[ ${TRAVIS_OS_NAME} == linux ]]; then
+        NOAPT=false;
+        MYPIPFLAGS="--user";
+    elif [[ ${TRAVIS_OS_NAME} == osx ]]; then
+        NOBREW=false;
+        MYPYTHON=python3;
+        MYPIP=pip3;
         MYPIPFLAGS="--user";
     fi
   - MYMCREPO=https://repo.continuum.io/miniconda
@@ -52,11 +57,16 @@ before_install:
   - $NOMC || wget --timestamping ${MYMCREPO}/${MYMCBUNDLE}
   - $NOMC || test -x ~/mc/bin/conda || bash ${MYMCBUNDLE} -b -f -p ~/mc
   - $NOMC || popd
-  - $NOMC || export PATH="${HOME}/mc/bin:${PATH}"
+  - $NOMC || source ~/mc/bin/activate root
   - $NOMC || conda update --yes conda
-  - $NOMC || conda install --yes conda-build jinja2
+  - $NOMC || conda install --yes conda-build jinja2 scons numpy
+  # Make scons available globally.
+  - $NOMC || mkdir -p ~/bin
+  - $NOMC || cp ~/mc/bin/scons ~/bin/
   - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
   - $NOMC || conda config --add channels diffpy
+  # FIXME - keep just the "diffpy" channel for public release.
+  - $NOMC || conda config --add channels diffpy/channel/dev
 
   - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
   - $NOAPT || sudo apt-get update -qq
@@ -70,6 +80,19 @@ before_install:
   - $NOAPT || git clone https://github.com/diffpy/libObjCryst.git
   - $NOAPT || popd
 
+  - $NOBREW || test "${TRAVIS_OS_NAME}" = "osx" || exit $?
+  - $NOBREW || brew update
+  - $NOBREW || brew install scons
+  - $NOBREW || brew install python3
+  - $NOBREW || brew install boost-python --with-python3
+  - $NOBREW || brew tap homebrew/python
+  - $NOBREW || brew install numpy --without-python --with-python3
+  - $NOBREW || devutils/makesdist
+  - $NOBREW || MYTARBUNDLE="$(ls -t "${PWD}"/dist/*.tar.gz | head -1)"
+  - $NOBREW || pushd ~/pkgs
+  - $NOBREW || git clone https://github.com/diffpy/libObjCryst.git
+  - $NOBREW || popd
+
 install:
   - $NOMC || conda build --python=${MYPYTHON_VERSION} --dirty conda-recipe
   - $NOMC || MYCONDATESTENV="$(ls -td ~/mc/conda-bld/${MYNAME}_*/_t_env* | head -1)"
@@ -78,20 +101,28 @@ install:
   - $NOMC || source activate testenv
   - $NOMC || conda install --yes --use-local --file=/tmp/mypackage.txt
 
-  - $NOAPT || pip install $MYPIPFLAGS coverage
+  - $NOAPT || $MYPIP install $MYPIPFLAGS coverage
   - $NOAPT || sudo scons -C ~/pkgs/libObjCryst install
-  - $NOAPT || easy_install --user "${MYTARBUNDLE}"
+  - $NOAPT || $MYPIP install $MYPIPFLAGS --user "${MYTARBUNDLE}"
+
+  - $NOBREW || $MYPIP install $MYPIPFLAGS coverage
+  - $NOBREW || scons -C ~/pkgs/libObjCryst install
+  - $NOBREW || $MYPIP install $MYPIPFLAGS "${MYTARBUNDLE}"
 
   - cd ${MYRUNDIR}
-  - MYGIT_REV=$(python -c "import ${MYNAME}.version as v; print(v.__gitsha__)")
+  - MYGIT_REV=$($MYPYTHON -c "import ${MYNAME}.version as v; print(v.__gitsha__)")
   - if [[ "${TRAVIS_COMMIT}" != "${MYGIT_REV}" ]]; then
         echo "Version mismatch ${TRAVIS_COMMIT} vs ${MYGIT_REV}.";
         exit 1;
     fi
 
+before_script:
+  - $NOBREW || USER_BASE="$(python3 -c 'import site; print(site.USER_BASE)')"
+  - $NOBREW || PATH="${USER_BASE}/bin:${PATH}"
+
 script:
   - coverage run --source ${MYNAME} -m ${MYNAME}.tests.run
 
 after_success:
-  - pip install $MYPIPFLAGS codecov
+  - $MYPIP install $MYPIPFLAGS codecov
   - codecov

SConstruct

@@ -29,18 +29,18 @@ def subdictionary(d, keyset):
 
 def getsyspaths(*names):
     s = os.pathsep.join(filter(None, map(os.environ.get, names)))
-    return filter(os.path.exists, s.split(os.pathsep))
+    rv = [p for p in s.split(os.pathsep) if os.path.exists(p)]
+    return rv
 
 def pyoutput(cmd):
     proc = subprocess.Popen([env['python'], '-c', cmd],
-            stdout=subprocess.PIPE)
+                            stdout=subprocess.PIPE)
     out = proc.communicate()[0]
     return out.rstrip()
 
 def pyconfigvar(name):
-    cmd = '\n'.join((
-            'from distutils.sysconfig import get_config_var',
-            'print get_config_var(%r)' % name))
+    cmd = ('from distutils.sysconfig import get_config_var\n'
+           'print(get_config_var(%r))\n') % name
     return pyoutput(cmd)
 
 # copy system environment variables related to compilation
@@ -93,7 +93,9 @@ env.MergeFlags([os.environ.get(n, '') for n in flagnames])
 good_python_flags = lambda n : (
     not isinstance(n, basestring) or
     not re.match(r'(-g|-Wstrict-prototypes|-O\d)$', n))
-env.ParseConfig("python-config --cflags")
+pyversion = pyoutput('import sys; print("%i.%i" % sys.version_info[:2])')
+pythonconfig = 'python' + pyversion + '-config'
+env.ParseConfig(pythonconfig + " --cflags")
 env.Replace(CCFLAGS=filter(good_python_flags, env['CCFLAGS']))
 env.Replace(CPPDEFINES='')
 # the CPPPATH directories are checked by scons dependency scanner
@@ -143,7 +145,7 @@ if env['profile']:
 
 builddir = env.Dir('build/%s-%s' % (env['build'], platform.machine()))
 
-Export('env', 'pyconfigvar', 'pyoutput')
+Export('env', 'pyconfigvar', 'pyoutput', 'pyversion')
 
 if os.path.isfile('sconscript.local'):
     env.SConscript('sconscript.local')

conda-recipe/build.sh

@@ -1,13 +1,18 @@
 #!/bin/bash
 
-export CPATH="$PREFIX/include:$CPATH"
-export LIBRARY_PATH="$PREFIX/lib:$LIBRARY_PATH"
-MYNCPU=$(( (CPU_COUNT > 8) ? 8 : CPU_COUNT ))
+export CPATH="${PREFIX}/include:$CPATH"
+export LIBRARY_PATH="${PREFIX}/lib:$LIBRARY_PATH"
+
+MYNCPU=$(( (CPU_COUNT > 4) ? 4 : CPU_COUNT ))
 
 if [ `uname` == Darwin ]; then
-    export DYLD_FALLBACK_LIBRARY_PATH="$PREFIX/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+    export DYLD_FALLBACK_LIBRARY_PATH="${PREFIX}/lib"
 fi
 
+# Apply sconscript.local customizations.
+cp ${RECIPE_DIR}/sconscript.local ./
+
+# Install package with scons to utilize multiple CPUs.
 scons -j $MYNCPU install prefix=$PREFIX
 
 # Add more build steps here, if they are necessary.

conda-recipe/meta.yaml

@@ -9,8 +9,6 @@ source:
   git_url: ..
 
 build:
-  #preserve_egg_dir: True
-
   # If this is a new build for the same version, increment the build
   # number. If you do not include this key, it defaults to 0.
   number: 0
@@ -19,17 +17,20 @@ requirements:
   build:
     - python
     - setuptools
-    - numpy 1.9.2
-    - libobjcryst 2015.1.*
-    - boost-all 1.59.0
-    - scons
+    - numpy 1.11.2
+    - libobjcryst 2015.1.*  # [py2k]
+    - boost-all 1.59.0      # [py2k]
+    - libobjcryst 2017.1.*  # [py3k]
+    - boost 1.61.0          # [py3k]
 
   run:
     - python
     - setuptools
-    - numpy >=1.9.2
-    - libobjcryst 2015.1.*
-    - boost-all 1.59.0
+    - numpy >=1.11.2
+    - libobjcryst 2015.1.*  # [py2k]
+    - boost-all 1.59.0      # [py2k]
+    - libobjcryst 2017.1.*  # [py3k]
+    - boost 1.61.0          # [py3k]
 
 test:
   # Python imports

conda-recipe/sconscript.local

@@ -0,0 +1,11 @@
+# Customize scons build environment.
+
+Import('env')
+
+import os
+
+# Silence copious warnings from the boost headers.
+P = os.environ['PREFIX']
+env.Prepend(CCFLAGS=['-isystem{}/include'.format(P)])
+
+# vim: ft=python

devutils/makesdist

@@ -21,11 +21,17 @@ vfb = versiondata.get('DEFAULT', 'version').split('.post')[0] + '.post0'
 emsg = "Invalid FALLBACK_VERSION. Expected %r got %r."
 assert vfb == FALLBACK_VERSION, emsg % (vfb, FALLBACK_VERSION)
 
-print 'Run "setup.py sdist --formats=tar"',
-cmd_sdist = [sys.executable] + 'setup.py sdist --formats=tar'.split()
+def inform(s):
+    sys.stdout.write(s)
+    sys.stdout.flush()
+    return
+
+inform('Run "setup.py sdist --formats=tar" ')
+cmd_sdist = ([sys.executable, '-Wignore:Cannot detect name suffix'] +
+             'setup.py sdist --formats=tar'.split())
 ec = subprocess.call(cmd_sdist, cwd=BASEDIR, stdout=open(os.devnull, 'w'))
 if ec:  sys.exit(ec)
-print "[done]"
+inform("[done]\n")
 
 tarname = max(glob.glob(BASEDIR + '/dist/*.tar'), key=os.path.getmtime)
 
@@ -40,11 +46,10 @@ def fixtarinfo(tinfo):
     tinfo.mode &= ~0o022
     return tinfo
 
-
-print 'Filter %s --> %s.gz' % (2 * (os.path.basename(tarname),)),
+inform('Filter %s --> %s.gz ' % (2 * (os.path.basename(tarname),)))
 for ti in tfin:
     tfout.addfile(fixtarinfo(ti), tfin.extractfile(ti))
 
 tfin.close()
 os.remove(tarname)
-print "[done]"
+inform("[done]\n")

doc/manual/source/conf.py

@@ -34,8 +34,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'pyobjcryst'
-copyright = u'%Y, Brookhaven National Laboratory'
+project = 'pyobjcryst'
+copyright = '%Y, Brookhaven National Laboratory'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

setup.py

@@ -9,6 +9,8 @@
 """
 
 import os
+import re
+import sys
 import glob
 from setuptools import setup
 from setuptools import Extension
@@ -26,6 +28,8 @@
         'include_dirs' : get_numpy_include_dirs(),
 }
 
+# determine if we run with Python 3.
+PY3 = (sys.version_info[0] == 3)
 
 # Figure out which boost library to use. This doesn't appear to consult
 # LD_LIBRARY_PATH.
@@ -36,7 +40,7 @@ def get_boost_libraries():
     on the system. If required libraries are not found, an Exception will be
     thrown.
     """
-    baselib = "boost_python"
+    baselib = "boost_python3" if PY3 else "boost_python"
     boostlibtags = ['', '-mt'] + ['']
     from ctypes.util import find_library
     for tag in boostlibtags:
@@ -52,7 +56,7 @@ def get_boost_libraries():
         if platform.system() == 'Darwin':
             ldevname = 'DYLD_FALLBACK_LIBRARY_PATH'
         wmsg = ("Cannot detect name suffix for the %r library.  "
-            "Consider setting %s.") % (baselib, ldevname)
+                "Consider setting %s.") % (baselib, ldevname)
         warnings.warn(wmsg)
 
     libs = [lib]
@@ -76,9 +80,10 @@ def create_extensions():
 versioncfgfile = os.path.join(MYDIR, 'src/pyobjcryst/version.cfg')
 gitarchivecfgfile = versioncfgfile.replace('version.cfg', 'gitarchive.cfg')
 
+
 def gitinfo():
     from subprocess import Popen, PIPE
-    kw = dict(stdout=PIPE, cwd=MYDIR)
+    kw = dict(stdout=PIPE, cwd=MYDIR, universal_newlines=True)
     proc = Popen(['git', 'describe', '--match=v[[:digit:]]*'], **kw)
     desc = proc.stdout.read()
     proc = Popen(['git', 'log', '-1', '--format=%H %at %ai'], **kw)
@@ -90,8 +95,10 @@ def gitinfo():
 
 
 def getversioncfg():
-    import re
-    from ConfigParser import RawConfigParser
+    if PY3:
+        from configparser import RawConfigParser
+    else:
+        from ConfigParser import RawConfigParser
     vd0 = dict(version=FALLBACK_VERSION, commit='', date='', timestamp=0)
     # first fetch data from gitarchivecfgfile, ignore if it is unexpanded
     g = vd0.copy()
@@ -120,7 +127,8 @@ def getversioncfg():
         cp.set('DEFAULT', 'commit', g['commit'])
         cp.set('DEFAULT', 'date', g['date'])
         cp.set('DEFAULT', 'timestamp', g['timestamp'])
-        cp.write(open(versioncfgfile, 'w'))
+        with open(versioncfgfile, 'w') as fp:
+            cp.write(fp)
     return cp
 
 versiondata = getversioncfg()
@@ -159,6 +167,9 @@ def getversioncfg():
         'Operating System :: Unix',
         'Programming Language :: C++',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Scientific/Engineering :: Chemistry',
         'Topic :: Scientific/Engineering :: Physics',
         'Topic :: Software Development :: Libraries',