From bf5ab32d55dbd5d20f42d7286f28a5597a83067a Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Mon, 27 Feb 2023 23:49:56 -0500
Subject: [PATCH] Bump version to 1.1.1 and document python2 is no longer
 supported (LP: #2008738)

---
 ChangeLog |  6 +++++-
 README.md | 16 ++++++++--------
 setup.py  |  8 ++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6236cb..a2bc9fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Version 1.1.0
+Version 1.1.1
+    - Document dropping of Python 2 support (dropped as of 1.1.0) (LP:
+      #20086738)
+
+2023-02-25 Version 1.1.0
     - Add domain validity check for ascii domains (no specials)
     - Add option to specify index number of signature to verify to dkimverify
       (Thanks to Nick Baugh for the change)
diff --git a/README.md b/README.md
index 17ffa21..6d0f27f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ https://tools.ietf.org/html/rfc6376
 
 # VERSION
 
-This is dkimpy 1.1.
+This is dkimpy 1.1.1.
 
 # REQUIREMENTS
 
@@ -24,12 +24,10 @@ extras_requires feature 'ARC' will add the extra dependencies needed for ARC.
 Similarly, extras_requires feature 'asyncio' will add the extra dependencies
 needed for asyncio.
 
- - Python 2.x >= 2.7, or Python 3.x >= 3.5.  Recent versions have not been
-   tested on python < 2.7 or python3 < 3.4, but may still work on python2.6
-   and python 3.1 - 3.3.
- - dnspython or pydns. dnspython is preferred if both are present and
+ - Python 3.x >= 3.5.  Recent versions have not been on python3 < 3.4, but
+   may still work on earlier python3 versions.
+ - dnspython or py3dns. dnspython is preferred if both are present and
    installed to satisfy the DNS module requirement if neither are installed.
- - argparse.  Standard library in python2.7 and later.
  - authres.  Needed for ARC.
  - PyNaCl.  Needed for use of ed25519 capability.
  - aiodns.  Needed for asycnio (Requires python3.5 or later)
@@ -83,8 +81,10 @@ As of 0.6.0, all tests pass for both python2.7 and python3. The test suite
  ships with test runners for dkimpy.  After downloading the test suite, you
  can run the signing and validation tests like this:
 
-```python2.7 ./testarc.py sign runners/arcsigntest.py```
-```python2.7 ./testarc.py validate runners/arcverifytest.py```
+```python3 ./testarc.py sign runners/arcsigntest.py```
+```python3 ./testarc.py validate runners/arcverifytest.py```
+
+As ov version 1.1.0, python2.7 is no longer supported.
 
 # USAGE
 
diff --git a/setup.py b/setup.py
index b469e89..8aa2fb4 100644
--- a/setup.py
+++ b/setup.py
@@ -25,15 +25,12 @@ from setuptools import setup
 import os
 import sys
 
-version = "1.1"
+version = "1.1.1"
 
 kw = {}  # Work-around for lack of 'or' requires in setuptools.
 try:
     import DNS
-    if sys.version_info[0] == 2:
-        kw['install_requires'] = ['PyDNS']
-    else:
-        kw['install_requires'] = ['Py3DNS']
+    kw['install_requires'] = ['Py3DNS']
 except ImportError:  # If PyDNS is not installed, prefer dnspython
     kw['install_requires'] = ['dnspython>=1.16.0']
 
@@ -73,7 +70,6 @@ setup(
       'License :: DFSG approved',
       'Natural Language :: English',
       'Operating System :: OS Independent',
-      'Programming Language :: Python',
       'Programming Language :: Python :: 3',
       'Topic :: Communications :: Email :: Mail Transport Agents',
       'Topic :: Communications :: Email :: Filters',