From 287b5166b6aa0163e32875f2e2f846bff8c27e97 Mon Sep 17 00:00:00 2001 From: Feanil Patel <feanil@edx.org> Date: Tue, 16 Jul 2019 14:41:12 -0400 Subject: [PATCH] Limit ruamel.ordereddict to python 2.7. (#21142) --- requirements/constraints.txt | 4 ++++ requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index f3fe48b3539..245344f757a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -60,3 +60,7 @@ python-slugify==1.2.6 # lms.djangoapps.course_api.tests.test_views.CourseListSearchViewTest.test_list_all_with_search_term # acceptance.tests.lms.test_lms_course_discovery.CourseDiscoveryTest.test_search edx-search==1.2.2 + +# This ruamel.ordereddict will not be supported in python3 but is a dependency of ruamel.yaml +# install it only on python 2.7 +ruamel.ordereddict; python_version == "2.7" diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 74e61cc8782..84ab0f79b79 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -213,7 +213,7 @@ requests-oauthlib==1.1.0 requests==2.22.0 rest-condition==1.0.3 rfc6266-parser==0.0.5.post2 -ruamel.ordereddict==0.4.13 # via ruamel.yaml +ruamel.ordereddict==0.4.13 ; python_version == "2.7" # via ruamel.yaml ruamel.yaml==0.15.99 # via drf-yasg rules==2.0.1 s3transfer==0.1.13 # via boto3 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ecf82359265..5377d6c0327 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -280,7 +280,7 @@ requests-oauthlib==1.1.0 requests==2.22.0 rest-condition==1.0.3 rfc6266-parser==0.0.5.post2 -ruamel.ordereddict==0.4.13 +ruamel.ordereddict==0.4.13 ; python_version == "2.7" ruamel.yaml==0.15.99 rules==2.0.1 s3transfer==0.1.13 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 20e16f37b4c..acbc5e98ff6 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -271,7 +271,7 @@ requests-oauthlib==1.1.0 requests==2.22.0 rest-condition==1.0.3 rfc6266-parser==0.0.5.post2 -ruamel.ordereddict==0.4.13 +ruamel.ordereddict==0.4.13 ; python_version == "2.7" ruamel.yaml==0.15.99 rules==2.0.1 s3transfer==0.1.13 -- GitLab