Remove mentions of Python 2 from docs & Makefile

encukou · encukou · commit c49250c3e9b8 · 2021-06-29T16:18:37.000+02:00
diff --git a/Doc/installing.rst b/Doc/installing.rst
@@ -130,7 +130,7 @@ Alpine
 
 Packages for building::
 
-    # apk add build-base openldap-dev python2-dev python3-dev
+    # apk add build-base openldap-dev python3-dev
 
 CentOS
 ------
@@ -145,12 +145,12 @@ Debian
 
 Packages for building and testing::
 
-   # apt-get install build-essential python3-dev python2.7-dev \
+   # apt-get install build-essential python3-dev \
        libldap2-dev libsasl2-dev slapd ldap-utils tox \
        lcov valgrind
-       
+
 .. note::
-   
+
    On older releases ``tox`` was called ``python-tox``.
 
 Fedora
@@ -159,7 +159,7 @@ Fedora
 Packages for building and testing::
 
    # dnf install "@C Development Tools and Libraries" openldap-devel \
-       python2-devel python3-devel python3-tox \
+       python3-devel python3-tox \
        lcov clang-analyzer valgrind
 
 .. note::
diff --git a/Doc/sample_workflow.rst b/Doc/sample_workflow.rst
@@ -61,15 +61,15 @@ This will run tests on all supported versions of Python that you have
 installed, skipping the ones you don't.
 To run a subset of test environments, run for example::
 
-    (__venv__)$ tox -e py27,py36
+    (__venv__)$ tox -e py36,py39
 
 In addition to ``pyXY`` environments, we have extra environments
 for checking things independent of the Python version:
 
 * ``doc`` checks syntax and spelling of the documentation
 * ``coverage-report`` generates a test coverage report for Python code.
-  It must be used last, e.g. ``tox -e py27,py36,coverage-report``.
-* ``py2-nosasltls`` and ``py3-nosasltls`` check functionality without
+  It must be used last, e.g. ``tox -e py36,py39,coverage-report``.
+* ``py3-nosasltls`` check functionality without
   SASL and TLS bindings compiled in.
 
 
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ lcov-clean:
 	if [ -d build ]; then find build -name '*.gc??' -delete; fi
 
 lcov-coverage:
-	WITH_GCOV=1 tox -e py27,py36
+	WITH_GCOV=1 tox -e py36
 
 $(LCOV_INFO): build
 	lcov --capture --directory build --output-file $(LCOV_INFO)
