Dropped python 3.5 and below.

.travis.yml

@@ -4,8 +4,8 @@ language: python
 
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27
+    - python: 3.6
+      env: TOXENV=py36
     - python: 3.7
       env: TOXENV=py37
     - python: 3.8

MANIFEST.in

@@ -1 +1 @@
-include LICENSE README.rst
+include LICENSE README.md

README.md

@@ -29,8 +29,8 @@ Resources:
 ## Install
 
 [wheezy.captcha](https://pypi.org/project/wheezy.captcha/) requires
-[python](http://www.python.org) version 2.4 to 2.7 or 3.2+. It is
-independent of operating system. You can install it from
+[python](http://www.python.org) version 3.6+. It is independent of operating
+system. You can install it from
 [pypi](https://pypi.org/project/wheezy.captcha/) site (you need specify
 extra requirements per imaging library of your choice):
 

demos/sample.py

@@ -1,7 +1,8 @@
 """
 """
 
-from wheezy.captcha.comp import ascii_uppercase
+from string import ascii_uppercase
+
 from wheezy.captcha.image import (
     background,
     captcha,

doc/gettingstarted.rst

@@ -5,10 +5,9 @@ Getting Started
 Install
 -------
 
-:ref:`wheezy.captcha` requires `python`_ version 2.4 to 2.7 or 3.2+.
-It is operating system independent. You can install it from the `pypi`_
-site (you need to specify an extra requirements per the imaging library
-of your choice)::
+:ref:`wheezy.captcha` requires `python`_ version 3.6+. It is operating system
+independent. You can install it from the `pypi`_ site (you need to specify
+an extra requirements per the imaging library of your choice)::
 
     $ pip install wheezy.captcha
     $ pip install wheezy.captcha[PIL]

requirements/dev-py3.txt → requirements/dev.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/dev-py3.txt requirements/dev.in
+#    pip-compile --output-file=requirements/dev.txt requirements/dev.in
 #
 atomicwrites==1.4.0       # via pytest
 attrs==20.3.0             # via pytest
@@ -14,23 +14,23 @@ mock==4.0.2               # via -r requirements/dev.in
 packaging==20.4           # via pytest
 pillow==8.0.0; platform_system == 'Windows' and implementation_name == 'pypy'             # via -r requirements/dev.in
 pillow==8.0.1; platform_system != 'Windows' or implementation_name != 'pypy'             # via -r requirements/dev.in
-pip-tools==5.3.1          # via -r requirements/dev.in
+pip-tools==5.4.0          # via -r requirements/dev.in
 pluggy==0.13.1            # via pytest
 py==1.9.0                 # via pytest
 pyparsing==2.4.7          # via packaging
 pytest-cov==2.10.1        # via -r requirements/dev.in
 pytest==6.1.2             # via -r requirements/dev.in, pytest-cov
 six==1.15.0               # via packaging, pip-tools
 toml==0.10.2              # via pytest
-wheezy.caching==2.0.0     # via wheezy.web
-wheezy.core==2.0.0        # via wheezy.http, wheezy.web
-wheezy.html==2.0.0        # via wheezy.web
-wheezy.http==2.0.0        # via wheezy.web
-wheezy.routing==2.0.0     # via wheezy.web
-wheezy.security==2.0.0    # via wheezy.web
+wheezy.caching==3.0.0     # via wheezy.web
+wheezy.core==3.0.0        # via wheezy.http, wheezy.web
+wheezy.html==3.0.0        # via wheezy.web
+wheezy.http==3.0.0        # via wheezy.web
+wheezy.routing==3.0.0     # via wheezy.web
+wheezy.security==3.0.0    # via wheezy.web
 wheezy.template==3.0.1    # via -r requirements/dev.in
-wheezy.validation==2.0.0  # via wheezy.web
-wheezy.web==2.0.0         # via -r requirements/dev.in
+wheezy.validation==3.0.0  # via wheezy.web
+wheezy.web==3.0.0         # via -r requirements/dev.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/docs.txt

@@ -31,8 +31,8 @@ sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-qthelp==1.0.3  # via sphinx
 sphinxcontrib-serializinghtml==1.1.4  # via sphinx
 urllib3==1.26.2           # via requests
-wheezy.core==2.0.0        # via wheezy.http
-wheezy.http==2.0.0        # via -r requirements/docs.in
+wheezy.core==3.0.0        # via wheezy.http
+wheezy.http==3.0.0        # via -r requirements/docs.in
 wheezy.template==3.0.1    # via -r requirements/docs.in
 
 # The following packages are considered to be unsafe in a requirements file:

setup.py

@@ -14,6 +14,7 @@
         [os.path.join(p, "*.py")],
         exclude=os.path.join(p, "__init__.py"),
         nthreads=2,
+        compiler_directives={"language_level": 3},
         quiet=True,
     )
 except ImportError:
@@ -39,6 +40,7 @@
 setup(
     name="wheezy.captcha",
     version=VERSION,
+    python_requires=">=3.6",
     description="A lightweight captcha library",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -53,16 +55,6 @@
         "Natural Language :: English",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.4",
-        "Programming Language :: Python :: 2.5",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

src/wheezy/captcha/comp.py

@@ -1,20 +1,6 @@
 """ ``comp`` module.
 """
 
-import sys
-
-PY3 = sys.version_info[0] >= 3
-
-
-if PY3:  # pragma: nocover
-    from string import ascii_uppercase
-
-    xrange = range
-else:  # pragma: nocover
-    from string import uppercase as ascii_uppercase  # noqa: F401
-
-    xrange = xrange
-
 try:  # pragma: nocover
     from PIL import Image, ImageFilter
     from PIL.ImageColor import getrgb

src/wheezy/captcha/image.py

@@ -3,14 +3,7 @@
 
 import random
 
-from wheezy.captcha.comp import (
-    Draw,
-    Image,
-    ImageFilter,
-    getrgb,
-    truetype,
-    xrange,
-)
+from wheezy.captcha.comp import Draw, Image, ImageFilter, getrgb, truetype
 
 
 def captcha(drawings, width=200, height=75):
@@ -87,7 +80,7 @@ def drawer(image, text):
         dy = height / 10
         height = height - dy
         draw = Draw(image)
-        for _ in xrange(number):
+        for _ in range(number):
             x = int(random.uniform(dx, width))
             y = int(random.uniform(dy, height))
             draw.line(((x, y), (x + level, y)), fill=color(), width=level)

tox.ini

@@ -1,15 +1,11 @@
 [tox]
-envlist = py27,py37,py38,py39,pypy3,lint,docs
+envlist = py36,py37,py38,py39,pypy3,lint,docs
 skipsdist = True
 
 [testenv]
 usedevelop = True
 deps =
-  py27: -r requirements/dev-py2.txt
-  py37: -r requirements/dev-py3.txt
-  py38: -r requirements/dev-py3.txt
-  py39: -r requirements/dev-py3.txt
-  pypy3: -r requirements/dev-py3.txt
+  -r requirements/dev.txt
 commands =
   pytest -q -x --disable-pytest-warnings --doctest-modules \
     --cov-report term-missing --cov wheezy.captcha