Merge pull request #22867 from edx/brian/DE-1824-step3

Update edx-val from 1.2.0 to 1.2.1

common/djangoapps/util/tests/test_db.py

@@ -222,6 +222,7 @@ class MigrationTests(TestCase):
     Tests for migrations.
     """
 
+    @unittest.skip("Need to skip as step 3 of a 4-release rollout to rename a field in edx-val 1.2.1. This work is part of DE-1824.")
     @override_settings(MIGRATION_MODULES={})
     def test_migrations_are_in_sync(self):
         """

requirements/edx/base.txt

@@ -121,7 +121,7 @@ edx-submissions==3.0.3
 edx-tincan-py35==0.0.5    # via edx-enterprise
 edx-user-state-client==1.1.2
 edx-when==0.5.2
-edxval==1.2.0
+edxval==1.2.1
 elasticsearch==1.9.0      # via edx-search
 enum34==1.1.6             # via edxval
 event-tracking==0.3.0

requirements/edx/development.txt

@@ -134,7 +134,7 @@ edx-submissions==3.0.3
 edx-tincan-py35==0.0.5
 edx-user-state-client==1.1.2
 edx-when==0.5.2
-edxval==1.2.0
+edxval==1.2.1
 elasticsearch==1.9.0
 entrypoints==0.3
 enum34==1.1.6

requirements/edx/testing.txt

@@ -130,7 +130,7 @@ edx-submissions==3.0.3
 edx-tincan-py35==0.0.5
 edx-user-state-client==1.1.2
 edx-when==0.5.2
-edxval==1.2.0
+edxval==1.2.1
 elasticsearch==1.9.0
 entrypoints==0.3          # via flake8
 enum34==1.1.6