From 49b5b88a30b8f666be1884557aae8c57a3844740 Mon Sep 17 00:00:00 2001 From: "Dave St.Germain" Date: Thu, 30 May 2019 09:06:45 -0400 Subject: [PATCH] Bumped edx-when --- lms/djangoapps/courseware/tests/test_views.py | 4 ++-- lms/djangoapps/instructor/views/instructor_dashboard.py | 2 +- .../course_experience/tests/views/test_course_updates.py | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index e3c8f95adc..df6d1ffa4b 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -216,8 +216,8 @@ class IndexQueryTestCase(ModuleStoreTestCase): NUM_PROBLEMS = 20 @ddt.data( - (ModuleStoreEnum.Type.mongo, 10, 179), - (ModuleStoreEnum.Type.split, 4, 173), + (ModuleStoreEnum.Type.mongo, 10, 181), + (ModuleStoreEnum.Type.split, 4, 175), ) @ddt.unpack def test_index_query_counts(self, store_type, expected_mongo_query_count, expected_mysql_query_count): diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index ed9e4347a7..d2bd43524e 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -160,7 +160,7 @@ def instructor_dashboard_2(request, course_id): unicode(course_key), len(paid_modes) ) - if access['instructor'] and is_enabled_for_course(course_key, request=request): + if access['instructor'] and is_enabled_for_course(course_key): sections.insert(3, _section_extensions(course)) # Gate access to course email by feature flag & by course-specific authorization diff --git a/openedx/features/course_experience/tests/views/test_course_updates.py b/openedx/features/course_experience/tests/views/test_course_updates.py index 787648ab67..45d51a5448 100644 --- a/openedx/features/course_experience/tests/views/test_course_updates.py +++ b/openedx/features/course_experience/tests/views/test_course_updates.py @@ -134,7 +134,7 @@ class TestCourseUpdatesPage(SharedModuleStoreTestCase): # Fetch the view and verify that the query counts haven't changed # TODO: decrease query count as part of REVO-28 - with self.assertNumQueries(53, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST): + with self.assertNumQueries(55, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST): with check_mongo_calls(4): url = course_updates_url(self.course) self.client.get(url) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 2e34fef76a..37ffed2dad 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -118,7 +118,7 @@ edx-search==1.2.2 git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3 edx-submissions==2.1.1 edx-user-state-client==1.1.0 -edx-when==0.1.5 +edx-when==0.1.6 edxval==1.1.25 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6108fbe45e..9b9f4641da 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -139,7 +139,7 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f edx-sphinx-theme==1.4.0 edx-submissions==2.1.1 edx-user-state-client==1.1.0 -edx-when==0.1.5 +edx-when==0.1.6 edxval==1.1.25 elasticsearch==1.9.0 entrypoints==0.3 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index f0f2ea64d1..c77ca79115 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -134,7 +134,7 @@ edx-search==1.2.2 git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3 edx-submissions==2.1.1 edx-user-state-client==1.1.0 -edx-when==0.1.5 +edx-when==0.1.6 edxval==1.1.25 elasticsearch==1.9.0 entrypoints==0.3 # via flake8