Require libdiffpy 1.3.3 or later.

Author: pavoljuhas

.travis.yml

@@ -61,9 +61,6 @@ before_install:
   - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
   - $NOMC || conda config --add channels diffpy
 
-  # FIXME - remove after libdiffpy release 1.3.3
-  - $NOMC || conda config --add channels pavoljuhas/channel/dev
-
   - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
   - $NOAPT || sudo apt-get update -qq
   - $NOAPT || sudo apt-get install -y

conda-recipe/meta.yaml

@@ -20,8 +20,7 @@ requirements:
     - python
     - setuptools
     - numpy 1.9.2
-    # FIXME - adjust for libdiffpy 1.3.3
-    - libdiffpy >=1.3.2.post24
+    - libdiffpy >=1.3.3,1.3.*
     - pycifrw
     - diffpy.structure
     - scons
@@ -30,8 +29,7 @@ requirements:
     - python
     - setuptools
     - numpy >=1.9.2
-    # FIXME - adjust for libdiffpy 1.3.3
-    - libdiffpy >=1.3.2.post24
+    - libdiffpy >=1.3.3,1.3.*
     - pycifrw
     - diffpy.structure
     - pyobjcryst 2.0*

srrealmodule/srreal_converters.hpp

@@ -34,9 +34,8 @@
 #include <diffpy/srreal/QuantityType.hpp>
 #include <diffpy/version.hpp>
 
-// FIXME - adjust for libdiffpy 1.3.3
-#if DIFFPY_VERSION < 1003002024
-#error "diffpy.srreal requires libdiffpy 1.3.2.post24 or later."
+#if DIFFPY_VERSION < 1003003000
+#error "diffpy.srreal requires libdiffpy 1.3.3 or later."
 #endif
 
 /// Conversion function that supports implicit conversions in