feat: add python311 support

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [quality, docs, pii_check, django32, django40]
+        python-version: ['3.8', '3.11']
+        toxenv: [quality, docs, pii_check, django42]
 
     steps:
     - uses: actions/checkout@v4
@@ -37,7 +37,7 @@ jobs:
       run: tox
 
     - name: Run coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
+      if: matrix.python-version == '3.8' && matrix.toxenv == 'django42'
       uses: codecov/codecov-action@v3
       with:
         flags: unittests

CHANGELOG.rst

@@ -14,6 +14,13 @@ Change Log
 Unreleased
 **********
 
+[5.7.0] - 2024-03-22
+********************
+Changed
+=======
+* Dropped Support for Django 3.2, Django 4.0 and Django 4.1
+* Added Support for Python 3.12
+
 [5.6.0] - 2024-01-25
 ********************
 Changed

edx_event_bus_kafka/__init__.py

@@ -9,4 +9,4 @@
 from edx_event_bus_kafka.internal.consumer import KafkaEventConsumer
 from edx_event_bus_kafka.internal.producer import KafkaEventProducer, create_producer
 
-__version__ = '5.6.0'
+__version__ = '5.7.0'

edx_event_bus_kafka/internal/consumer.py

@@ -315,7 +315,7 @@ def _consume_indefinitely(self):
                             consecutive_errors = 0
 
                     self._add_message_monitoring(run_context=run_context, message=msg)
-                except Exception as e:  # pylint: disable=broad-except
+                except Exception as e:
                     consecutive_errors += 1
                     self.record_event_consuming_error(run_context, e, msg)
                     # Kill the infinite loop if the error is fatal for the consumer
@@ -515,7 +515,7 @@ def _log_message_received(self, msg):
                 f'offset={msg.offset()}, message_id={message_id}, key={msg.key()}, '
                 f'event_timestamp_ms={timestamp_info}'
             )
-        except Exception as e:  # pragma: no cover  pylint: disable=broad-except
+        except Exception as e:  # pragma: no cover
             # Use this to fix any bugs in what should be benign logging code
             set_custom_attribute('kafka_logging_error', repr(e))
 
@@ -603,7 +603,7 @@ def _add_message_monitoring(self, run_context, message, error=None):
                 # .. custom_attribute_description: Boolean describing if the error is retriable.
                 set_custom_attribute('kafka_error_retriable', kafka_error.retriable())
 
-        except Exception as e:  # pragma: no cover  pylint: disable=broad-except
+        except Exception as e:  # pragma: no cover
             # Use this to fix any bugs in what should be benign monitoring code
             set_custom_attribute('kafka_monitoring_error', repr(e))
 

edx_event_bus_kafka/internal/producer.py

@@ -316,7 +316,7 @@ def send(
             # would never get a delivery callback. That's why there's also a thread calling
             # poll(0) on a regular interval (see `poll_indefinitely`).
             self.producer.poll(0)
-        except Exception as e:  # pylint: disable=broad-except
+        except Exception as e:
             # Errors caused by the produce call should be handled by the on_delivery callback.
             # Here we might expect serialization errors, or any errors from preparing to produce.
             record_producing_error(e, context)

edx_event_bus_kafka/management/commands/produce_event.py

@@ -64,5 +64,5 @@
                 event_metadata=EventsMetadata(event_type=event_type),
             )
             producer.prepare_for_shutdown()  # otherwise command may exit before delivery is complete
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             logger.exception("Error producing Kafka event")

requirements/base.txt

@@ -4,19 +4,23 @@
 #
 #    make upgrade
 #
-asgiref==3.7.2
+asgiref==3.8.0
     # via django
 attrs==23.2.0
     # via openedx-events
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
 cffi==1.16.0
     # via pynacl
 click==8.1.7
     # via
     #   code-annotations
     #   edx-django-utils
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via edx-toggles
-django==3.2.24
+django==4.2.11
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -33,7 +37,7 @@ django-waffle==4.1.0
     # via
     #   edx-django-utils
     #   edx-toggles
-edx-django-utils==5.10.1
+edx-django-utils==5.11.0
     # via
     #   -r requirements/base.in
     #   edx-toggles
@@ -48,7 +52,7 @@ jinja2==3.1.3
     # via code-annotations
 markupsafe==2.1.5
     # via jinja2
-newrelic==9.6.0
+newrelic==9.7.1
     # via edx-django-utils
 openedx-events==9.5.2
     # via -r requirements/base.in
@@ -64,20 +68,18 @@ pynacl==1.5.0
     # via edx-django-utils
 python-slugify==8.0.4
     # via code-annotations
-pytz==2024.1
-    # via django
 pyyaml==6.0.1
     # via code-annotations
 sqlparse==0.4.4
     # via django
-stevedore==5.1.0
+stevedore==5.2.0
     # via
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
 text-unidecode==1.3
     # via python-slugify
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   edx-opaque-keys

requirements/ci.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cachetools==5.3.2
+cachetools==5.3.3
     # via tox
 chardet==5.2.0
     # via tox
@@ -16,7 +16,7 @@ filelock==3.13.1
     # via
     #   tox
     #   virtualenv
-packaging==23.2
+packaging==24.0
     # via
     #   pyproject-api
     #   tox
@@ -32,7 +32,7 @@ tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.13.0
+tox==4.14.1
     # via -r requirements/ci.in
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via tox

requirements/constraints.txt

@@ -10,3 +10,6 @@
 
 # Common constraints for edx repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+
+# For python greater than or equal to 3.9 backports.zoneinfo causing failures
+backports.zoneinfo; python_version<'3.9'