[Getfem-commits] (no subject)

[Tetsuo Koyama]

branch: devel-tetsuo-move-to-python3
commit edea39d158d83ae64c263d24a5340e4e9c4df838
Author: Tetsuo Koyama <address@hidden>
Date:   Sun Oct 27 14:03:33 2019 +0900

    Moving to require Python 3
---
 .travis.yml                              |  2 +-
 configure.ac                             | 14 +-------------
 doc/sphinx/source/documenting/markup.rst |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1dba38..5cb0048 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ script:
 - export CPPFLAGS=-coverage
 - export CFLAGS=-coverage
 - export FCFLAGS=-coverage
-- ./configure --with-pic --enable-python3=yes
+- ./configure --with-pic
 - make -j8
 - make -j8 check
 after_success:
diff --git a/configure.ac b/configure.ac
index 9789db2..f758f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -964,19 +964,7 @@ AC_ARG_ENABLE(python,
    *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;;
  esac],[usepython=YES])
 
-AC_ARG_ENABLE(python3,
- [AS_HELP_STRING([--enable-python3],[turn on/off python3 (instead of python2) 
support])],
- [case "${enableval}" in
-   yes) usepython3=YES ;;
-   no)  usepython3=NO ;;
-   *) AC_MSG_ERROR([bad value ${enableval} for --enable-python3]) ;;
- esac],[usepython3=NO])
-
-if test x$usepython3 = xYES; then
-  AM_PATH_PYTHON(3.4, usepython=YES, usepython=NO)
-elif test x$usepython = xYES; then
-  AM_PATH_PYTHON(2.7, usepython=YES, usepython=NO)
-fi
+AM_PATH_PYTHON(3.7, usepython=YES, usepython=NO)
 
 case $host in
     *mingw*)
diff --git a/doc/sphinx/source/documenting/markup.rst 
b/doc/sphinx/source/documenting/markup.rst
index 409387d..4fb2f2c 100644
--- a/doc/sphinx/source/documenting/markup.rst
+++ b/doc/sphinx/source/documenting/markup.rst
@@ -428,7 +428,7 @@ in a different style:
    The name of a file or directory.  Within the contents, you can use curly
    braces to indicate a "variable" part, for example::
 
-      ... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
+      ... is installed in :file:`/usr/lib/python3.{x}/site-packages` ...
 
    In the built documentation, the ``x`` will be displayed differently to
    indicate that it is to be replaced by the Python minor version.