Merge branch 'update-conda-recipe' into maint

* skip unnecessary dependency installation in conda-build
* use recent diffpy.structure and diffpy.utils
* anticipate later Python-s for conda-build
* use pip to install for system python test
* skip conda-build test in travis as it needs DISPLAY
* switch to ubuntu xenial on travis
* fix incorrect import for conda-build test
* use latest pycifrw in travis test
* enable old conda packages in travis test

Author: pavoljuhas

.travis.yml

@@ -1,6 +1,4 @@
-# Use container-based travis workers
-sudo: false
-
+dist: xenial
 language: generic
 
 os:
@@ -23,15 +21,6 @@ branches:
   except:
     - /^v[0-9]/
 
-addons:
-  apt:
-    packages:
-    - build-essential
-    - libgsl0-dev
-    - python-dev
-    - python-numpy
-    - python-setuptools
-    - python-wxtools
 
 before_install:
   - MYNAME=diffpy.pdfgui
@@ -70,24 +59,32 @@ before_install:
   - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
   - $NOMC || conda config --add channels diffpy
 
+  # TODO - remove after update to wxpython 4
+  - $NOMC || conda config --set restore_free_channel true
+
   - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
   - $NOAPT || PATH="$(echo "$PATH" | sed 's,:/opt/pyenv/[^:]*,,g')"
   - $NOAPT || test "$(which python)" = "/usr/bin/python" || (
                   which python; exit 1)
+  - $NOAPT || sudo apt-get update -qq
+  - $NOAPT || sudo apt-get install -y
+                  build-essential libgsl0-dev python-dev
+                  python-numpy python-setuptools python-pip python-wxtools
   - $NOAPT || devutils/makesdist
   - $NOAPT || MYTARBUNDLE="$(ls -t "${PWD}"/dist/*.tar.gz | head -1)"
 
 install:
-  - $NOMC || conda build --python=${MYPYTHON_VERSION} conda-recipe
+  - $NOMC || conda build --python=${MYPYTHON_VERSION} --no-test conda-recipe
   - $NOMC || conda render --python=${MYPYTHON_VERSION} --output conda-recipe |
                 sed 's,.*/,,; s/[.]tar[.]bz2$//; s/-/=/g' > /tmp/mypackage.txt
   - $NOMC || source activate testenv
   - $NOMC || conda install --yes --use-local --file=/tmp/mypackage.txt
 
+  # TODO - remove after fix of libgsl.a location in pdffit2
+  - $NOAPT || sudo ln -si /usr/lib/x86_64-linux-gnu/libgsl.a /usr/lib/libgsl.a
+
   - $NOAPT || pip install $MYPIPFLAGS coverage
-  # TODO - remove after fixup release of PyCifRW following 4.3.
-  - $NOAPT || pip install $MYPIPFLAGS "pycifrw==4.2.1"
-  - $NOAPT || easy_install --user "${MYTARBUNDLE}"
+  - $NOAPT || pip install $MYPIPFLAGS "${MYTARBUNDLE}"
 
   - cd ${MYRUNDIR}
   - MYGIT_REV=$(python -c "import ${MYNAME}.version as v; print(v.__git_commit__)")

conda-recipe/bld.bat

@@ -1,4 +1,4 @@
-%PYTHON% setup.py install
+%PYTHON% -m pip install --no-deps -vv .
 if errorlevel 1 exit 1
 
 :: Add more build steps here, if they are necessary.

conda-recipe/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-$PYTHON setup.py install
+$PYTHON -m pip install --no-deps -vv .
 
 # Add more build steps here, if they are necessary.
 

conda-recipe/conda_build_config.yaml

@@ -0,0 +1,2 @@
+python:
+  - 2.7

conda-recipe/meta.yaml

@@ -27,12 +27,10 @@ app:
   summary: materials structure analysis from Pair Distribution Function
 
 requirements:
-  build:
-    - python
+  host:
+    - python {{ python }}
+    - pip
     - setuptools
-    - diffpy.pdffit2
-    - diffpy.structure 1.*
-    - diffpy.utils 1.*
 
   run:
     - python
@@ -41,8 +39,8 @@ requirements:
     - wxpython 3.*
     - menuinst                  [win]
     - diffpy.pdffit2
-    - diffpy.structure 1.*
-    - diffpy.utils 1.*
+    - diffpy.structure
+    - diffpy.utils
 
 test:
   # Python imports

conda-recipe/run_test.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-import diffpy.pdffit2.tests
-assert diffpy.pdffit2.tests.testdeps().wasSuccessful()
+import diffpy.pdfgui.tests
+assert diffpy.pdfgui.tests.testdeps().wasSuccessful()

setup.py

@@ -100,9 +100,9 @@ def dirglob(d, *patterns):
     # manual and tutorial files should not be zipped
     zip_safe = False,
     install_requires = [
-        'diffpy.Structure>=1.2',
-        'diffpy.pdffit2>=1.1a0',
-        'diffpy.utils>=1.1',
+        'diffpy.structure',
+        'diffpy.pdffit2',
+        'diffpy.utils',
     ],
 
     author = 'Simon J.L. Billinge',