Skip to content

Commit b845ef0

Browse files
committed
remove "support" for BerkeleyDB 3.1, it hasn't worked for a long time
1 parent d4e48b7 commit b845ef0

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Doc/lib/libbsddb.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ \section{\module{bsddb} ---
1515
serialize them somehow, typically using marshal.dumps or pickle.dumps.
1616

1717
Starting with Python 2.3 the \module{bsddb} module requires the
18-
Berkeley DB library version 3.1 or later (it is known to work with 3.1
19-
thru 4.1 at the time of this writing).
18+
Berkeley DB library version 3.2 or later (it is known to work with 3.2
19+
thru 4.2 at the time of this writing).
2020

2121
\begin{seealso}
2222
\seeurl{http://pybsddb.sourceforge.net/}{Website with documentation

setup.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -470,14 +470,10 @@ def detect_modules(self):
470470
# Sleepycat Berkeley DB interface. http://www.sleepycat.com
471471
#
472472
# This requires the Sleepycat DB code. The earliest supported version
473-
# of that library is 3.1, the latest supported version is 4.2. A list
473+
# of that library is 3.2, the latest supported version is 4.2. A list
474474
# of available releases can be found at
475475
#
476476
# http://www.sleepycat.com/update/index.html
477-
#
478-
# NOTE: 3.1 is only partially supported; expect the extended bsddb module
479-
# test suite to show failures due to some missing methods and behaviours
480-
# in BerkeleyDB 3.1.
481477

482478
# when sorted in reverse order, keys for this dict must appear in the
483479
# order you wish to search - e.g., search for db4 before db3
@@ -500,17 +496,15 @@ def detect_modules(self):
500496
'/sw/include/db4',
501497
'/usr/include/db4',
502498
)},
503-
'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
499+
'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
504500
'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
505501
'/usr/local/BerkeleyDB.3.2/lib',
506-
'/usr/local/BerkeleyDB.3.1/lib',
507502
'/usr/local/lib',
508503
'/opt/sfw/lib',
509504
'/sw/lib',
510505
),
511506
'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
512507
'/usr/local/BerkeleyDB.3.2/include',
513-
'/usr/local/BerkeleyDB.3.1/include',
514508
'/usr/local/include/db3',
515509
'/opt/sfw/include/db3',
516510
'/sw/include/db3',

0 commit comments

Comments
 (0)