general: Python 2.6 & 3.3 support deprecated -- added notes in docs

4 files changed, 23 insertions, 2 deletions

diff --git a/docs/history/1.7.rst b/docs/history/1.7.rst
index 7027f18..f5452dc 100644
--- a/docs/history/1.7.rst
+++ b/docs/history/1.7.rst
@@ -46,6 +46,19 @@ Bugfixes
 * **unittests**: ``crypt()`` unittests now account for linux systems running libxcrypt
   (such as recent Fedora releases)
 
+Deprecations
+------------
+
+.. rst-class:: float-center
+
+.. warning::
+
+    Due to lack of ``pip`` and ``venv`` support, Passlib is no longer fully tested on Python
+    2.6 & 3.3.  There are no known issues, and bugfixes against these versions will still be
+    accepted for the Passlib 1.7.x series.
+    However, **Passlib 1.8 will drop support for Python 2.6 & 3.3; and Passlib 2.0 will drop
+    support for Python 2.x entirely.**
+
 Other Changes
 -------------
 
diff --git a/docs/install.rst b/docs/install.rst
index 2f09ea6..8cf0b45 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -9,12 +9,19 @@ Supported Platforms
 Passlib requires Python 2 (>= 2.6) or Python 3 (>= 3.3).
 It is known to work with the following Python implementations:
 
+.. rst-class:: float-right
+
+.. warning::
+
+    * Support for Python 2.6 and 3.3 will be dropped in Passlib 1.8
+
+    * Support for Python 2.x will be dropped in Passlib 2.0
+
 * CPython 2 -- v2.6 or newer.
 * CPython 3 -- v3.3 or newer.
 * PyPy -- v2.0 or newer.
 * PyPy3 -- v5.3 or newer.
 * Jython -- v2.7 or newer.
-* Pyston -- v0.5.1 or newer.
 
 Passlib should work with all operating systems and environments,
 as it contains builtin fallbacks for almost all OS-dependant features.
diff --git a/passlib/tests/test_context.py b/passlib/tests/test_context.py
index 89fb9fe..ffd37e9 100644
--- a/passlib/tests/test_context.py
+++ b/passlib/tests/test_context.py
@@ -299,7 +299,7 @@ sha512_crypt__min_rounds = 45000
     def test_09_repr(self):
         """test repr()"""
         cc1 = CryptContext(**self.sample_1_dict)
-        # NOTE: "0x-1234" format used by Pyston 0.5.1
+        # NOTE: "0x-1234" format used by Pyston 0.5.1 (support deprecated 2019-11)
         self.assertRegex(repr(cc1), "^<CryptContext at 0x-?[0-9a-f]+>$")
 
     #===================================================================
diff --git a/passlib/utils/compat/__init__.py b/passlib/utils/compat/__init__.py
index 1386b5c..fe3b906 100644
--- a/passlib/utils/compat/__init__.py
+++ b/passlib/utils/compat/__init__.py
@@ -27,6 +27,7 @@ if PYPY and sys.pypy_version_info < (2,0):
     raise RuntimeError("passlib requires pypy >= 2.0 (as of passlib 1.7)")
 
 # e.g. '2.7.7\n[Pyston 0.5.1]'
+# NOTE: deprecated support 2019-11
 PYSTON = "Pyston" in sys.version
 
 #=============================================================================