Skip to content

Commit 7bf5669

Browse files
committed
Support Python 3.8, desupport 2.6 and 3.4 (#24)
1 parent 4f60459 commit 7bf5669

10 files changed

+22
-27
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*~
22
*.bak
33
*.default
4+
*.egg-info
45
*.log
56
*.patch
67
*.pid
@@ -16,6 +17,8 @@ dist
1617
.tox
1718
.pytest_cache
1819

20+
test.bat
21+
1922
MANIFEST
2023

2124
Thumbs.db

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
language: python
55

66
python:
7-
- "2.6"
87
- "2.7"
9-
- "3.4"
108
- "3.5"
119
- "3.6"
10+
- "3.7"
11+
- "3.8"
1212

1313
install:
1414
- pip install pytest

DBUtils/Docs/UsersGuide.de.rst

+6-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,12 @@ wenn Sie DBUtils in die Webware-Dokumentation integrieren wollen::
111111
Anforderungen
112112
=============
113113

114-
DBUtils benötigt mindestens Python_ Version 2.6. Die Module in der Variante
115-
für klassisches PyGreSQL benötigen PyGreSQL_ Version 3.4 oder höher, während
116-
die Module in der allgemeinen Variante für DB-API 2 mit jedem beliebigen
117-
Python-Datenbankadapter-Modul zusammenarbeiten, das auf `DB-API 2`_ basiert.
114+
DBUtils unterstützt die Python_ Versionen 2.7 und 3.5 bis 3.8.
115+
116+
Die Module in der Variante für klassisches PyGreSQL benötigen PyGreSQL_
117+
Version 4.0 oder höher, während die Module in der allgemeinen Variante
118+
für DB-API 2 mit jedem beliebigen Python-Datenbankadapter-Modul zusammenarbeiten,
119+
das auf `DB-API 2`_ basiert.
118120

119121

120122
Funktionalität

DBUtils/Docs/UsersGuide.rst

+5-4
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,11 @@ integrate the DBUtils documentation into the Webware documentation::
110110
Requirements
111111
============
112112

113-
DBUtils requires at least Python_ version 2.6. The modules in the classic
114-
PyGreSQL variant need PyGreSQL_ version 3.4 or above, while the modules
115-
in the universal DB-API 2 variant run with any Python `DB-API 2`_ compliant
116-
database interface module.
113+
DBUtils supports Python_ version 2.6 and Python versions 3.5 to 3.8.
114+
115+
The modules in the classic PyGreSQL variant need PyGreSQL_ version 4.0
116+
or above, while the modules in the universal DB-API 2 variant run with
117+
any Python `DB-API 2`_ compliant database interface module.
117118

118119

119120
Functionality

DBUtils/PersistentDB.py

-5
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@
9393
since it clears the threading.local data between requests).
9494
9595
96-
Requirements:
97-
98-
Python >= 2.6.
99-
100-
10196
Ideas for improvement:
10297
10398
* Add a thread for monitoring, restarting (or closing) bad or expired

DBUtils/PersistentPg.py

-5
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@
8484
since it clears the threading.local data between requests).
8585
8686
87-
Requirements:
88-
89-
Python >= 2.6, PyGreSQL >= 3.4.
90-
91-
9287
Ideas for improvement:
9388
9489
* Add a thread for monitoring, restarting (or closing) bad or expired

DBUtils/Properties.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
status = 'beta'
1010

11-
requiredPyVersion = (2, 6, 0)
11+
requiredPyVersion = (2, 7, 0)
1212

1313
synopsis = (
1414
"DBUtils provides database related support classes and functions"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ to a database that can be used in all kinds of multi-threaded environments
66
like Webware for Python or other web application servers. The suite supports
77
DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
88

9-
The current version of DBUtils supports Python versions 2.6, 2.7 and 3.4 - 3.7.
9+
The current version of DBUtils supports Python versions 2.7 and 3.5 - 3.8.
1010

1111
The DBUtils home page can be found here: https://cito.github.io/DBUtils/

setup.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from sys import version_info
66

77
py_version = version_info[:2]
8-
if not (2, 6) <= py_version <= (2, 7) and not (3, 4) <= py_version < (4, 0):
8+
if py_version != (2, 7) and not (3, 5) <= py_version < (4, 0):
99
raise ImportError('Python %d.%d is not supported by DBUtils.' % py_version)
1010

1111
warnings.filterwarnings('ignore', 'Unknown distribution option')
@@ -27,13 +27,12 @@
2727
'License :: OSI Approved :: MIT License',
2828
'Programming Language :: Python',
2929
'Programming Language :: Python :: 2',
30-
'Programming Language :: Python :: 2.6',
3130
'Programming Language :: Python :: 2.7',
3231
'Programming Language :: Python :: 3',
33-
'Programming Language :: Python :: 3.4',
3432
'Programming Language :: Python :: 3.5',
3533
'Programming Language :: Python :: 3.6',
3634
'Programming Language :: Python :: 3.7',
35+
'Programming Language :: Python :: 3.8',
3736
'Topic :: Database',
3837
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
3938
'Topic :: Software Development :: Libraries :: Python Modules'

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{26,27,34,35,36,37}, flake8
2+
envlist = py{27,35,36,37,38}, flake8
33

44
[pytest]
55
python_files=Test*.py
@@ -18,4 +18,4 @@ basepython =
1818
deps =
1919
flake8
2020
commands =
21-
flake8 DBUtils
21+
flake8 DBUtils

0 commit comments

Comments
 (0)