summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hows <howsdav@gmail.com>2016-12-19 11:24:26 +1100
committerAlex Gorrod <alexander.gorrod@mongodb.com>2016-12-19 11:24:26 +1100
commit8ae0338420c8902bdaf323f66ff09d44d4e6eb0c (patch)
treeb640de41e0515118304e2917cbfcf7a3b8128af5
parentea8b8b7688acbeea1a1a3a0ee84c8373d8f8a32d (diff)
downloadmongo-8ae0338420c8902bdaf323f66ff09d44d4e6eb0c.tar.gz
WT-3075 Document and enforce that WiredTiger now depends on Python 2.7 (#3196)
-rw-r--r--build_posix/configure.ac.in2
-rwxr-xr-xsrc/docs/build-pydoc.sh2
-rw-r--r--src/docs/testing.dox2
-rw-r--r--src/docs/upgrading.dox11
4 files changed, 11 insertions, 6 deletions
diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in
index 952c9ae607d..b7c39b5da8b 100644
--- a/build_posix/configure.ac.in
+++ b/build_posix/configure.ac.in
@@ -133,7 +133,7 @@ if test "$wt_cv_enable_java" = "yes"; then
fi
if test "$wt_cv_enable_python" = "yes"; then
- AM_PATH_PYTHON([2.6])
+ AM_PATH_PYTHON([2.7])
if test -n "$with_python_prefix" ; then
PYTHON_INSTALL_ARG="-d $with_python_prefix"
fi
diff --git a/src/docs/build-pydoc.sh b/src/docs/build-pydoc.sh
index 5e6e3635be5..aef88fd4c97 100755
--- a/src/docs/build-pydoc.sh
+++ b/src/docs/build-pydoc.sh
@@ -3,4 +3,4 @@ TOP=$DOCS/..
. $TOP/config.sh
cd python
-PYTHONPATH=../../lang/python/src:$THRIFT_HOME/lib/python2.6/site-packages pydoc -w wiredtiger
+PYTHONPATH=../../lang/python/src:$THRIFT_HOME/lib/python2.7/site-packages pydoc -w wiredtiger
diff --git a/src/docs/testing.dox b/src/docs/testing.dox
index 7d454d54212..cf280e8f3ff 100644
--- a/src/docs/testing.dox
+++ b/src/docs/testing.dox
@@ -27,7 +27,7 @@ The WiredTiger unit test suite includes tests that cover:
The WiredTiger Python test suite is built using the WiredTiger Python
API and the Python unittest functionality (the test suite requires at
-least Python version 2.6).
+least Python version 2.7).
The WiredTiger test suite automatically runs as part of every commit
into the WiredTiger GitHub source tree.
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
index 0b0826f2646..1e0e2eaf99a 100644
--- a/src/docs/upgrading.dox
+++ b/src/docs/upgrading.dox
@@ -1,14 +1,19 @@
/*! @page upgrading Upgrading WiredTiger applications
-
@section version_291 Upgrading to Version 2.9.1
-
<dl>
+<dt>WiredTiger now requires Python 2.7 at minimum</dt>
+<dd>
+The minimum version of Python supported by WiredTiger is now 2.7 up from the
+previous version of 2.6. This is due to extra unit tests added in this release
+that depend on 2.7. This is not due to a change in the Python API.
+</dd>
+
<dt>Changes to hazard pointer configuration</dt>
<dd>
The \c hazard_max parameter to ::wiredtiger_open is now ignored. Memory is
allocated for hazard pointers as required by each session.
</dd>
-</dl>
+</dl><hr>
@section version_290 Upgrading to Version 2.9.0
<dl>