ci: ensure compatibility with Python 2.7;

docs: update setup.py,README.md

Author: gstarovo

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
         include:
           # first test on vanilla environments
           - name: py2.7
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
           - name: py3.7
             os: ubuntu-22.04
@@ -46,7 +46,7 @@ jobs:
             python-version: 2.6
           # then test with the different optional dependencies installed
           - name: py2.7 with m2crypto
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
             opt-deps: ['m2crypto']
           - name: py3.7 with m2crypto
@@ -70,7 +70,7 @@ jobs:
             python-version: '3.11'
             opt-deps: ['m2crypto']
           - name: py2.7 with pycrypto
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
             opt-deps: ['pycrypto']
           - name: py3.10 with pycryptodome
@@ -80,7 +80,7 @@ jobs:
             # it doesn't break pycrypto code
             opt-deps: ['pycryptodome']
           - name: py2.7 with gmpy
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
             opt-deps: ['gmpy']
           - name: py3.7 with gmpy
@@ -101,7 +101,7 @@ jobs:
             python-version: '3.10'
             opt-deps: ['gmpy']
           - name: py2.7 with gmpy2
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
             opt-deps: ['gmpy2']
           - name: py3.7 with gmpy2
@@ -133,7 +133,7 @@ jobs:
             python-version: '3.13'
             opt-deps: ['gmpy2']
           - name: py2.7 with brotli
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
             # zstandard is available for py3.8 and above
             opt-deps: ['brotli']
@@ -188,7 +188,7 @@ jobs:
             opt-deps: ["kyber_py"]
           # finally test with multiple dependencies installed at the same time
           - name: py2.7 with m2crypto, pycrypto, gmpy, gmpy2, and brotli
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             python-version: 2.7
             opt-deps: ['m2crypto', 'pycrypto', 'gmpy', 'gmpy2', 'brotli']
           - name: py3.7 with m2crypto, gmpy, gmpy2, and brotli
@@ -275,15 +275,17 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Ensure python 2.7
+      - name: Ensure working pip on python 2.7
         if: matrix.python-version == '2.7'
         run: |
           sudo apt-get update
+          sudo add-apt-repository universe
           sudo apt-get install -y \
-            python2.7 python2.7-dev python-pip-whl
+            python2.7 python2.7-dev
+          curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
           sudo ln -sf python2.7 /usr/bin/python
-          export PYTHONPATH=`echo /usr/share/python-wheels/pip-*py2*.whl`
-          sudo --preserve-env=PYTHONPATH python -m pip install --upgrade pip setuptools wheel
+          sudo python get-pip.py
+          sudo pip install setuptools wheel
           sudo chown -R $USER /usr/local/lib/python2.7
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
@@ -312,7 +314,7 @@ jobs:
           pip install setuptools-28.8.0-py2.py3-none-any.whl wheel-0.30.0a0-py2.py3-none-any.whl
       - name: Install M2Crypto for python 2.7
         if: ${{ contains(matrix.opt-deps, 'm2crypto') && matrix.python-version == '2.7' }}
-        run: pip install M2Crypto==0.37.1
+        run: pip install M2Crypto==0.38.0
       - name: Install M2Crypto for python
         if: ${{ contains(matrix.opt-deps, 'm2crypto') && matrix.python-version != '2.7'  }}
         run: pip install --pre M2Crypto
@@ -445,7 +447,7 @@ jobs:
           PYTHON_VERSION: ${{ matrix.python-version }}
         run: |
           opt=""
-          if ! [[ $PYTHON_VERSION == 2.6 || $PYTHON_VERSION == 2.7 || $PYTHON_VERSION == 3.3 || $PYTHON_VERSION == 3.4 || $PYTHON_VERSION == 3.5 ||| $PYTHON_VERSION == 3.6]]; then
+          if ! [[ $PYTHON_VERSION == 2.6 || $PYTHON_VERSION == 2.7 || $PYTHON_VERSION == 3.3 || $PYTHON_VERSION == 3.4 || $PYTHON_VERSION == 3.5 ]]; then
               opt="--compare-branch origin/master"
           fi
           pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" tlslite > pylint_report.txt || :

README.md

@@ -95,7 +95,7 @@ Currently it is distributed under Gnu LGPLv2 license.
 Requirements:
 
 * Python 2.6 or higher is required.
-* Python 3.6 or higher is supported.
+* Python 3.7 or higher is supported.
 * python ecdsa >= 0.13.3 library
   ([GitHub](https://github.com/warner/python-ecdsa),
   [PyPI](https://pypi.python.org/pypi/ecdsa))

setup.py

@@ -24,7 +24,7 @@
                     'package1': ['LICENSE', 'README.md']},
       install_requires=['ecdsa>=0.18.0b1'],
       obsoletes=["tlslite"],
-      python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
+      python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*",
       classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Intended Audience :: Developers',
@@ -35,7 +35,6 @@
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3.9',