|
[Rivet-svn] rivet: Allow Cython 0.24 again. The issue in YODA is resolved.Rivet Mercurial rivet at projects.hepforge.orgFri Sep 30 14:00:01 BST 2016
details: https://rivet.hepforge.org/hg/rivet/rev/0f575c32fca6 branches: release-2-5-x changeset: 5543:0f575c32fca6 user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Fri Sep 30 13:56:54 2016 +0100 description: Allow Cython 0.24 again. The issue in YODA is resolved. diffs (35 lines): --- a/configure.ac Thu Sep 29 16:08:15 2016 +0100 +++ b/configure.ac Fri Sep 30 13:56:54 2016 +0100 @@ -273,30 +273,13 @@ if test x$enable_pyext == xyes; then AM_CHECK_CYTHON([0.23.5], [:], [:]) if test x$CYTHON_FOUND = xyes; then - AS_VERSION_COMPARE([$CYTHON_VERSION], [0.24], - [AC_MSG_NOTICE([Cython >= 0.23.5 found: Python extension source can be rebuilt (for developers)])], - [AC_MSG_NOTICE([ -************************************************** -Cython 0.24.x does not work for non-tarball builds - (https://github.com/cython/cython/issues/1465) - -You can install a personal copy of Cython with - pip install --user cython==0.23.5 -**************************************************]); CYTHON_FOUND="no"], - [AC_MSG_NOTICE([ -************************************************** -Cython 0.24.x does not work for non-tarball builds - (https://github.com/cython/cython/issues/1465) - -You can install a personal copy of Cython with - pip install --user cython==0.23.5 -**************************************************]); CYTHON_FOUND="no"]) + AC_MSG_NOTICE([Cython >= 0.23.5 found: Python extension source can be rebuilt (for developers)]) fi AC_CHECK_FILE([pyext/rivet/core.cpp], [], [if test "x$CYTHON_FOUND" != "xyes"; then - AC_MSG_ERROR([Cython is required for --enable-pyext.]) + AC_MSG_ERROR([Cython is required for --enable-pyext, no pre-built core.cpp was found.]) fi]) cython_compiler=$CXX
More information about the Rivet-svn mailing list |