From 099a2823c11c9d3248bce4f93523660fcca67735 Mon Sep 17 00:00:00 2001
From: Ludovic Rousseau <ludovic.rousseau@free.fr>
Date: Sun, 20 Oct 2024 16:03:13 +0200
Subject: [PATCH] Release 2.2.0

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
---
 ChangeLog                 | 19 +++++++++++++++++--
 setup.py                  |  2 +-
 src/smartcard/doc/conf.py |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a533925..42297cd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,22 @@
-Unreleased changes
-==================
+2.2.0 (October 2024)
+====================
+- patches from Ludovic Rousseau
+   * PCSCCardRequest: 
+    - handle KeyboardInterrupt in waitforcard() & waitforcardevent()
+	- use a local PC/SC context to avoid locks
+   * smartcard.util.padd(): do NOT modify the input parameter
+   * CardMonitoring: a timeout exception IS expected
+   * Fix pydoctor documentation
+   * wx: fix module and examples
+   * Minor changes
+- patches from Kurt McKee
    * Remove Python 2 conditional code
+   * Eliminate Windows Vista and Windows 7 conditionals
+   * Test and improve the synchronization code
+   * Test and update the `Observer.py` code
+   * Remove `ClassLoader.py`
    * Migrate a `src/` layout
+   * Migrate test/* from unittest to pytest
    * Add missing GSM 03.38 symbols for decoding
    * Support only Python 3.9 and higher
    * Remove the Python 2.x-only Pyro dependency
diff --git a/setup.py b/setup.py
index 078e398a..c739ea27 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@
     except:
         platform_include_dirs = ["/usr/include/PCSC", "/usr/local/include/PCSC"]
 
-VERSION_INFO = (2, 1, 1, 0)
+VERSION_INFO = (2, 2, 0, 0)
 VERSION_STR = "%i.%i.%i" % VERSION_INFO[:3]
 VERSION_ALT = "%i,%01i,%01i,%04i" % VERSION_INFO
 
diff --git a/src/smartcard/doc/conf.py b/src/smartcard/doc/conf.py
index 746c286a..a1503f52 100644
--- a/src/smartcard/doc/conf.py
+++ b/src/smartcard/doc/conf.py
@@ -18,9 +18,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "2.1.1"
+version = "2.2.0"
 # The full version, including alpha/beta/rc tags.
-release = "2.1.1"
+release = "2.2.0"
 
 pygments_style = "sphinx"