Require recent development version of libdiffpy.

Author: pavoljuhas

.travis.yml

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

srrealmodule/srreal_converters.hpp

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

srrealmodule/wrap_PairQuantity.cpp

@@ -359,10 +359,8 @@ std::string stringevaluatortype(PQEvaluatorType tp)
             return evtp_BASIC;
         case OPTIMIZED:
             return evtp_OPTIMIZED;
-#if DIFFPY_VERSION >= 1003002023
         case CHECK:
             return evtp_CHECK;
-#endif
     }
     const char* emsg = "Unknown internal value of PQEvaluatorType.";
     PyErr_SetString(PyExc_NotImplementedError, emsg);
@@ -381,15 +379,10 @@ void setevaluatortype(PairQuantity& pq, const std::string& tp)
 {
     if (tp == evtp_BASIC)  return pq.setEvaluatorType(BASIC);
     if (tp == evtp_OPTIMIZED)  return pq.setEvaluatorType(OPTIMIZED);
-#if DIFFPY_VERSION >= 1003002023
     if (tp == evtp_CHECK)  return pq.setEvaluatorType(CHECK);
     python::object emsg = ("evaluatortype must be one of %r." %
             python::make_tuple(python::make_tuple(
                     evtp_BASIC, evtp_OPTIMIZED, evtp_CHECK)));
-#else
-    python::object emsg = ("evaluatortype must be either %r or %r." %
-            python::make_tuple(evtp_BASIC, evtp_OPTIMIZED));
-#endif
     PyErr_SetObject(PyExc_ValueError, emsg.ptr());
     throw_error_already_set();
 }