Merge pull request #19839 from sprihajha/master

Resolving INCR-42

requirements/constraints.txt

@@ -11,6 +11,7 @@
 # These packages are backports which can only be installed on Python 2.7
 functools32 ; python_version == "2.7"
 futures ; python_version == "2.7"
+python-openid ; python_version == "2.7"
 
 # six is at 1.12.0, but transifex-client requires ==1.11.0
 # https://github.com/transifex/transifex-client/issues/252

requirements/edx/base.in

@@ -123,7 +123,7 @@ pymongo                             # MongoDB driver
 pynliner                            # Inlines CSS styles into HTML for email notifications
 python-dateutil==2.4
 python-Levenshtein
-python-openid
+python3-openid ; python_version>='3' 
 python3-saml
 pyuca==1.1                          # For more accurate sorting of translated country names in django-countries
 reportlab                           # Used for shopping cart's pdf invoice/receipt generation

requirements/edx/base.txt

@@ -198,7 +198,7 @@ pysrt==1.1.1
 python-dateutil==2.4.0
 python-levenshtein==0.12.0
 python-memcached==1.48
-python-openid==2.2.5
+python-openid==2.2.5 ; python_version == "2.7"  # via social-auth-core
 python-swiftclient==3.6.0
 python3-saml==1.5.0
 pytz==2018.9
@@ -236,7 +236,7 @@ urllib3==1.23
 user-util==0.1.5
 voluptuous==0.11.5
 watchdog==0.9.0
-web-fragments==0.2.2
+web-fragments==0.3.0
 webencodings==0.5.1       # via html5lib
 webob==1.8.5              # via xblock
 wrapt==1.10.5

requirements/edx/development.txt

@@ -280,7 +280,7 @@ python-dateutil==2.4.0
 python-levenshtein==0.12.0
 python-memcached==1.48
 python-mimeparse==1.6.0
-python-openid==2.2.5
+python-openid==2.2.5 ; python_version == "2.7"
 python-slugify==1.2.6
 python-subunit==1.3.0
 python-swiftclient==3.6.0
@@ -348,7 +348,7 @@ voluptuous==0.11.5
 vulture==1.0
 w3lib==1.20.0
 watchdog==0.9.0
-web-fragments==0.2.2
+web-fragments==0.3.0
 webencodings==0.5.1
 webob==1.8.5
 werkzeug==0.14.1

requirements/edx/testing.txt

@@ -271,7 +271,7 @@ python-dateutil==2.4.0
 python-levenshtein==0.12.0
 python-memcached==1.48
 python-mimeparse==1.6.0   # via testtools
-python-openid==2.2.5
+python-openid==2.2.5 ; python_version == "2.7"
 python-slugify==1.2.6     # via transifex-client
 python-subunit==1.3.0
 python-swiftclient==3.6.0
@@ -334,7 +334,7 @@ virtualenv==16.4.0        # via tox
 voluptuous==0.11.5
 w3lib==1.20.0             # via parsel, scrapy
 watchdog==0.9.0
-web-fragments==0.2.2
+web-fragments==0.3.0
 webencodings==0.5.1
 webob==1.8.5
 werkzeug==0.14.1          # via flask