Merge branch 'julien-duponchelle:main' into main

Author: dongwook-chan

.github/workflows/pytest.yml

@@ -8,11 +8,8 @@ jobs:
       matrix:
         include:
           - {name: 'CPython 3.7', python: '3.7'}
-          - {name: 'CPython 3.8', python: '3.8'}
-          - {name: 'CPython 3.9', python: '3.9'}
-          - {name: 'CPython 3.10', python: '3.10'}
+          - {name: 'CPython 3.11', python: '3.11'}
           - {name: 'Pypy 3.7', python: 'pypy-3.7'}
-          - {name: 'Pypy 3.8', python: 'pypy-3.8'}
           - {name: 'Pypy 3.9', python: 'pypy-3.9'}
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -28,4 +28,4 @@ jobs:
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        password: ${{ secrets.PYPI_API_TOKEN }}

CHANGELOG

@@ -189,4 +189,10 @@
 * Add XAPrepareEvent, parse last_committed & sequence_number of GtidEvent
 
 0.42.1 09/07/2023
-* Fix merging error of XAPrepareEvent
+* Fix merging error of XAPrepareEvent
+
+0.42.2 16/07/2023
+* Fix release error
+
+0.43.0 23/07/2023
+* Bump PyMySQL to 1.1.0 to solve : LookupError: unknown encoding: utf8mb3

docs/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.42.1'
+version = '0.43'
 # The full version, including alpha/beta/rc tags.
-release = '0.42.1'
+release = '0.43'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pymysqlreplication/event.py

@@ -62,7 +62,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
         self.commit_flag = struct.unpack("!B", self.packet.read(1))[0] == 1
         self.sid = self.packet.read(16)
         self.gno = struct.unpack('<Q', self.packet.read(8))[0]
-        self.lt_type = byte2int(self.packet.read(1))
+        self.lt_type = self.packet.read(1)[0]
 
         if self.mysql_version >= (5, 7):
             self.last_committed = struct.unpack('<Q', self.packet.read(8))[0]

pymysqlreplication/tests/test_basic.py

@@ -25,9 +25,9 @@ def ignoredEvents(self):
         return [GtidEvent]
 
     def test_allowed_event_list(self):
-        self.assertEqual(len(self.stream._allowed_event_list(None, None, False)), 15)
-        self.assertEqual(len(self.stream._allowed_event_list(None, None, True)), 14)
-        self.assertEqual(len(self.stream._allowed_event_list(None, [RotateEvent], False)), 14)
+        self.assertEqual(len(self.stream._allowed_event_list(None, None, False)), 16)
+        self.assertEqual(len(self.stream._allowed_event_list(None, None, True)), 15)
+        self.assertEqual(len(self.stream._allowed_event_list(None, [RotateEvent], False)), 15)
         self.assertEqual(len(self.stream._allowed_event_list([RotateEvent], None, False)), 1)
 
     def test_read_query_event(self):
@@ -693,11 +693,11 @@ def test_ignore_decode_errors(self):
             ignore_decode_errors=False
         )
         event = self.stream.fetchone()
-        event = self.stream.fetchone()   
+        event = self.stream.fetchone()
         with self.assertRaises(UnicodeError) as exception:
             event = self.stream.fetchone()
             data = event.rows[0]["values"]["data"]
-        
+
         # Initialize with ignore_decode_errors=True
         self.stream = BinLogStreamReader(
             self.database,
@@ -706,11 +706,11 @@ def test_ignore_decode_errors(self):
             ignore_decode_errors=True
         )
         self.stream.fetchone()
-        self.stream.fetchone()        
+        self.stream.fetchone()
         event = self.stream.fetchone()
         data = event.rows[0]["values"]["data"]
         self.assertEqual(data, '[{"text":"  Some string"}]')
-    
+
     def test_drop_column(self):
         self.stream.close()
         self.execute("CREATE TABLE test_drop_column (id INTEGER(11), data VARCHAR(50))")

setup.py

@@ -29,7 +29,7 @@ def run(self):
         unittest.main(tests, argv=sys.argv[:1])
 
 
-version = "0.42"
+version = "0.43.0"
 
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
@@ -49,5 +49,5 @@ def run(self):
               "pymysqlreplication.constants",
               "pymysqlreplication.tests"],
     cmdclass={"test": TestCommand},
-    install_requires=['pymysql>=0.10'],
+    install_requires=['pymysql>=1.1.0'],
 )