edx-celeryutils 1.3.0__tar.gz → 2.0.0__tar.gz

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/CHANGELOG.rst

@@ -14,6 +14,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[1.4.0] - 2024-03-31
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added django5.2 support. Adding new migration with index_together change.
+* Dropped Python 3.8 support
+
 [1.3.0] - 2024-03-31
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Added python3.11 and 3.12 support. Dropped django32 support.

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: edx-celeryutils
-Version: 1.3.0
+Version: 2.0.0
 Summary: Code to support working with celery
 Home-page: https://github.com/openedx/edx-celeryutils
 Author: edX
@@ -14,15 +14,25 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.2
 License-File: LICENSE.txt
 License-File: AUTHORS
 Requires-Dist: Django
 Requires-Dist: celery<6.0
 Requires-Dist: django-model-utils
 Requires-Dist: jsonfield
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 edx-celeryutils
 =============================
@@ -123,6 +133,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[1.4.0] - 2024-03-31
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added django5.2 support. Adding new migration with index_together change.
+* Dropped Python 3.8 support
+
 [1.3.0] - 2024-03-31
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Added python3.11 and 3.12 support. Dropped django32 support.

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/celery_utils/__init__.py

@@ -2,4 +2,4 @@
 Code to support working with celery.
 """
 
-__version__ = '1.3.0'
+__version__ = '2.0.0'

edx_celeryutils-2.0.0/celery_utils/migrations/0003_rename_failedtask_task_name_exc_idx_failedtask_task_exc.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2025-04-09 02:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('celery_utils', '0002_chordable_django_backend'),
+    ]
+
+    operations = [
+        migrations.RenameIndex(
+            model_name='failedtask',
+            new_name='idx_failedtask_task_exc',
+            old_fields=('task_name', 'exc'),
+        ),
+    ]

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/celery_utils/models.py

@@ -39,8 +39,8 @@ class FailedTask(TimeStampedModel):
         To specify any metadata for FailedTask model.
         """
 
-        index_together = [
-            ('task_name', 'exc'),
+        indexes = [
+            models.Index(fields=['task_name', 'exc'], name='idx_failedtask_task_exc')
         ]
 
     def reapply(self):

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/edx_celeryutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: edx-celeryutils
-Version: 1.3.0
+Version: 2.0.0
 Summary: Code to support working with celery
 Home-page: https://github.com/openedx/edx-celeryutils
 Author: edX
@@ -14,15 +14,25 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.2
 License-File: LICENSE.txt
 License-File: AUTHORS
 Requires-Dist: Django
 Requires-Dist: celery<6.0
 Requires-Dist: django-model-utils
 Requires-Dist: jsonfield
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 edx-celeryutils
 =============================
@@ -123,6 +133,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[1.4.0] - 2024-03-31
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added django5.2 support. Adding new migration with index_together change.
+* Dropped Python 3.8 support
+
 [1.3.0] - 2024-03-31
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Added python3.11 and 3.12 support. Dropped django32 support.

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/edx_celeryutils.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ celery_utils/management/commands/tests/test_cleanup_resolved_tasks.py
 celery_utils/management/commands/tests/test_reapply_tasks.py
 celery_utils/migrations/0001_initial.py
 celery_utils/migrations/0002_chordable_django_backend.py
+celery_utils/migrations/0003_rename_failedtask_task_name_exc_idx_failedtask_task_exc.py
 celery_utils/migrations/__init__.py
 edx_celeryutils.egg-info/PKG-INFO
 edx_celeryutils.egg-info/SOURCES.txt

{edx-celeryutils-1.3.0 → edx_celeryutils-2.0.0}/setup.py

@@ -32,20 +32,48 @@ def load_requirements(*requirements_paths):
     """
     # UPDATED VIA SEMGREP - if you need to remove/modify this method remove this line and add a comment specifying why.
 
+    # e.g. {"django": "Django", "confluent-kafka": "confluent_kafka[avro]"}
+    by_canonical_name = {}
+
+    def check_name_consistent(package):
+        """
+        Raise exception if package is named different ways.
+
+        This ensures that packages are named consistently so we can match
+        constraints to packages. It also ensures that if we require a package
+        with extras we don't constrain it without mentioning the extras (since
+        that too would interfere with matching constraints.)
+        """
+        canonical = package.lower().replace('_', '-').split('[')[0]
+        seen_spelling = by_canonical_name.get(canonical)
+        if seen_spelling is None:
+            by_canonical_name[canonical] = package
+        elif seen_spelling != package:
+            raise Exception(
+                f'Encountered both "{seen_spelling}" and "{package}" in requirements '
+                'and constraints files; please use just one or the other.'
+            )
+
     requirements = {}
     constraint_files = set()
 
-    # groups "my-package-name<=x.y.z,..." into ("my-package-name", "<=x.y.z,...")
-    requirement_line_regex = re.compile(r"([a-zA-Z0-9-_.]+)([<>=][^#\s]+)?")
+    # groups "pkg<=x.y.z,..." into ("pkg", "<=x.y.z,...")
+    re_package_name_base_chars = r"a-zA-Z0-9\-_."  # chars allowed in base package name
+    # Two groups: name[maybe,extras], and optionally a constraint
+    requirement_line_regex = re.compile(
+        r"([%s]+(?:\[[%s,\s]+\])?)([<>=][^#\s]+)?"
+        % (re_package_name_base_chars, re_package_name_base_chars)
+    )
 
     def add_version_constraint_or_raise(current_line, current_requirements, add_if_not_present):
         regex_match = requirement_line_regex.match(current_line)
         if regex_match:
             package = regex_match.group(1)
             version_constraints = regex_match.group(2)
+            check_name_consistent(package)
             existing_version_constraints = current_requirements.get(package, None)
-            # it's fine to add constraints to an unconstrained package, but raise an error if there are already
-            # constraints in place
+            # It's fine to add constraints to an unconstrained package,
+            # but raise an error if there are already constraints in place.
             if existing_version_constraints and existing_version_constraints != version_constraints:
                 raise BaseException(f'Multiple constraint definitions found for {package}:'
                                     f' "{existing_version_constraints}" and "{version_constraints}".'
@@ -54,7 +82,8 @@ def load_requirements(*requirements_paths):
             if add_if_not_present or package in current_requirements:
                 current_requirements[package] = version_constraints
 
-    # process .in files and store the path to any constraint files that are pulled in
+    # Read requirements from .in files and store the path to any
+    # constraint files that are pulled in.
     for path in requirements_paths:
         with open(path) as reqs:
             for line in reqs:
@@ -63,7 +92,7 @@ def load_requirements(*requirements_paths):
                 if line and line.startswith('-c') and not line.startswith('-c http'):
                     constraint_files.add(os.path.dirname(path) + '/' + line.split('#')[0].replace('-c', '').strip())
 
-    # process constraint files and add any new constraints found to existing requirements
+    # process constraint files: add constraints to existing requirements
     for constraint_file in constraint_files:
         with open(constraint_file) as reader:
             for line in reader:
@@ -123,8 +152,8 @@ setup(
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Framework :: Django :: 4.2',
+        'Framework :: Django :: 5.2',
     ],
 )