mirror of https://github.com/OpenKMIP/PyKMIP.git
Merge pull request #246 from OpenKMIP/maint/drop-support-for-python2.6
Remove support for Python2.6
This commit is contained in:
commit
4dbf6b8e79
|
@ -1,8 +1,6 @@
|
||||||
language: python
|
language: python
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- python: 2.6
|
|
||||||
env: TOXENV=py26
|
|
||||||
- python: 2.7
|
- python: 2.7
|
||||||
env: TOXENV=py27
|
env: TOXENV=py27
|
||||||
- python: 3.3
|
- python: 3.3
|
||||||
|
|
|
@ -343,9 +343,7 @@ PyKMIP has been tested and runs on the following platform(s):
|
||||||
|
|
||||||
* Ubuntu: 12.04 LTS, 14.04 LTS, 16.04 LTS
|
* Ubuntu: 12.04 LTS, 14.04 LTS, 16.04 LTS
|
||||||
|
|
||||||
PyKMIP is supported by Python 2.6, 2.7, 3.3 - 3.6.
|
PyKMIP is supported by Python 2.7 and 3.3 - 3.6.
|
||||||
|
|
||||||
**NOTE:** Support for Python 2.6 will be deprecated in a future release of PyKMIP.
|
|
||||||
|
|
||||||
References
|
References
|
||||||
==========
|
==========
|
||||||
|
|
|
@ -15,8 +15,6 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import sys
|
|
||||||
import warnings
|
|
||||||
|
|
||||||
# Dynamically set __version__
|
# Dynamically set __version__
|
||||||
version_path = os.path.join(os.path.dirname(
|
version_path = os.path.join(os.path.dirname(
|
||||||
|
@ -27,12 +25,3 @@ with open(version_path, 'r') as version_file:
|
||||||
|
|
||||||
|
|
||||||
__all__ = ['core', 'demos', 'services']
|
__all__ = ['core', 'demos', 'services']
|
||||||
|
|
||||||
|
|
||||||
if sys.version_info[:2] == (2, 6):
|
|
||||||
warnings.simplefilter("always")
|
|
||||||
warnings.warn(
|
|
||||||
("Please use a newer version of Python (2.7.9+ preferred). PyKMIP "
|
|
||||||
"support for Python 2.6 will be deprecated in the future."),
|
|
||||||
PendingDeprecationWarning)
|
|
||||||
warnings.simplefilter("default")
|
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -56,7 +56,6 @@ setuptools.setup(
|
||||||
"Operating System :: POSIX :: Linux",
|
"Operating System :: POSIX :: Linux",
|
||||||
"Programming Language :: Python",
|
"Programming Language :: Python",
|
||||||
"Programming Language :: Python :: 2",
|
"Programming Language :: Python :: 2",
|
||||||
"Programming Language :: Python :: 2.6",
|
|
||||||
"Programming Language :: Python :: 2.7",
|
"Programming Language :: Python :: 2.7",
|
||||||
"Programming Language :: Python :: 3.3",
|
"Programming Language :: Python :: 3.3",
|
||||||
"Programming Language :: Python :: 3.4",
|
"Programming Language :: Python :: 3.4",
|
||||||
|
|
Loading…
Reference in New Issue