chore: rebase

openedx · Oct 8, 2024 · 2ead760 · 2ead760
2 parents 7ee9a25 + 640e711
commit 2ead760
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,10 +17,14 @@ Unreleased
 ----------
 * nothing unreleased
 
-[4.27.1]
+[4.27.2]
 ---------
 * fix: update logic to correct getting the accepted members count from a group
 
+[4.27.1]
+---------
+* chore: remove `replaces` sections from squashing migrations.
+
 [4.27.0]
 ---------
 * chore: Add index to the username field in the `Consent` model

diff --git a/enterprise/__init__.py b/enterprise/__init__.py
@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.27.1"
+__version__ = "4.27.2"
diff --git a/enterprise/api/v1/serializers.py b/enterprise/api/v1/serializers.py
@@ -645,9 +645,6 @@ class Meta:
 
     def get_accepted_members_count(self, obj):
         "Returns count for accepted members"
-
-        # groups that have applies_to_all_contexts enabled returns a list of of objects
-        # so we need to loop through the list to check for the status
         accepted_members = obj.get_all_learners().filter(status=GROUP_MEMBERSHIP_ACCEPTED_STATUS)
         return len(accepted_members)
 

diff --git a/...11_alter_sapsuccessfactorslearnerdatatransmissionaudit_enterprise_course_enrollment_id.py b/...11_alter_sapsuccessfactorslearnerdatatransmissionaudit_enterprise_course_enrollment_id.py
@@ -9,7 +9,8 @@
 
 class Migration(migrations.Migration):
 
-    replaces = [('sap_success_factors', '0001_squashed_0022_auto_20200206_1046'), ('sap_success_factors', '0002_sapsuccessfactorslearnerdatatransmissionaudit_credit_hours'), ('sap_success_factors', '0003_auto_20210701_1556'), ('sap_success_factors', '0004_auto_20210708_1639'), ('sap_success_factors', '0005_sapsuccessfactorsenterprisecustomerconfiguration_prevent_learner_self_submit_grades'), ('sap_success_factors', '0006_sapsuccessfactorsenterprisecustomerconfiguration_idp_id'), ('sap_success_factors', '0007_sapsuccessfactorsenterprisecustomerconfiguration_disable_learner_data_transmissions'), ('sap_success_factors', '0008_alter_sapsuccessfactorsenterprisecustomerconfiguration_enterprise_customer'), ('sap_success_factors', '0009_auto_20220126_1837'), ('sap_success_factors', '0010_sapsuccessfactorsenterprisecustomerconfiguration_display_name'), ('sap_success_factors', '0011_alter_sapsuccessfactorslearnerdatatransmissionaudit_enterprise_course_enrollment_id')]
+    # Commenting out `replaces` to allow --prune to function correctly and clean up the migrations table.
+    # replaces = [('sap_success_factors', '0001_squashed_0022_auto_20200206_1046'), ('sap_success_factors', '0002_sapsuccessfactorslearnerdatatransmissionaudit_credit_hours'), ('sap_success_factors', '0003_auto_20210701_1556'), ('sap_success_factors', '0004_auto_20210708_1639'), ('sap_success_factors', '0005_sapsuccessfactorsenterprisecustomerconfiguration_prevent_learner_self_submit_grades'), ('sap_success_factors', '0006_sapsuccessfactorsenterprisecustomerconfiguration_idp_id'), ('sap_success_factors', '0007_sapsuccessfactorsenterprisecustomerconfiguration_disable_learner_data_transmissions'), ('sap_success_factors', '0008_alter_sapsuccessfactorsenterprisecustomerconfiguration_enterprise_customer'), ('sap_success_factors', '0009_auto_20220126_1837'), ('sap_success_factors', '0010_sapsuccessfactorsenterprisecustomerconfiguration_display_name'), ('sap_success_factors', '0011_alter_sapsuccessfactorslearnerdatatransmissionaudit_enterprise_course_enrollment_id')]
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

diff --git a/...ap_success_factors/migrations/0004_auto_20220324_1550_squashed_0006_auto_20220330_1157.py b/...ap_success_factors/migrations/0004_auto_20220324_1550_squashed_0006_auto_20220330_1157.py
@@ -7,7 +7,8 @@
 
 class Migration(migrations.Migration):
 
-    replaces = [('sap_success_factors', '0004_auto_20220324_1550'), ('sap_success_factors', '0005_auto_20220325_1757'), ('sap_success_factors', '0006_auto_20220330_1157')]
+    # Commenting out `replaces` to allow --prune to function correctly and clean up the migrations table.
+    # replaces = [('sap_success_factors', '0004_auto_20220324_1550'), ('sap_success_factors', '0005_auto_20220325_1757'), ('sap_success_factors', '0006_auto_20220330_1157')]
 
     dependencies = [
         ('sap_success_factors', '0003_alter_sapsuccessfactorslearnerdatatransmissionaudit_completed_timestamp'),