From 1e8b6d5a00bce9b79670a78e761c0aa1208c3f5b Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@edx.org>
Date: Thu, 26 Mar 2020 10:20:20 -0400
Subject: [PATCH] Make upgrade to get the latest edx-when (1.1.3)
Also pinned httpretty < 1.0 because that upgrade broke many tests.
---
lms/djangoapps/courseware/tests/test_views.py | 4 ++--
requirements/constraints.txt | 3 +++
requirements/edx/base.txt | 6 +++---
requirements/edx/coverage.txt | 2 +-
requirements/edx/development.txt | 8 ++++----
requirements/edx/paver.txt | 2 +-
requirements/edx/testing.txt | 8 ++++----
7 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index eb1ee10f9bf..abb698d1ea1 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -1521,8 +1521,8 @@ class ProgressPageTests(ProgressPageBaseTests):
@patch.dict(settings.FEATURES, {'ASSUME_ZERO_GRADE_IF_ABSENT_FOR_ALL_TESTS': False})
@ddt.data(
- (False, 62, 41),
- (True, 53, 36)
+ (False, 62, 40),
+ (True, 53, 35)
)
@ddt.unpack
def test_progress_queries(self, enable_waffle, initial, subsequent):
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 5e462bd4f0b..762052af75f 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -37,6 +37,9 @@ factory-boy==2.8.1
# Newer versions need a more recent version of python-dateutil
freezegun==0.3.12
+# When we went from httpretty 0.9.7 to 1.0.2, tests broke
+httpretty<1.0
+
# 4.0.0 dropped support for Python 3.5
inflect<4.0.0
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index df2eed441ed..1b24354fe42 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -30,7 +30,7 @@ attrs==19.3.0 # via -r requirements/edx/base.in, edx-ace
babel==2.8.0 # via -r requirements/edx/base.in, django-babel, django-babel-underscore
beautifulsoup4==4.8.2 # via pynliner
billiard==3.3.0.23 # via celery
-bleach==3.1.3 # via -r requirements/edx/base.in, edx-enterprise, lti-consumer-xblock, ora2
+bleach==3.1.4 # via -r requirements/edx/base.in, edx-enterprise, lti-consumer-xblock, ora2
boto3==1.4.8 # via -r requirements/edx/base.in, fs-s3fs
boto==2.39.0 # via -r requirements/edx/base.in, django-ses, edxval, ora2
botocore==1.8.17 # via -r requirements/edx/base.in, boto3, s3transfer
@@ -116,7 +116,7 @@ edx-sga==0.10.0 # via -r requirements/edx/base.in
edx-submissions==3.0.4 # via -r requirements/edx/base.in, ora2
edx-tincan-py35==0.0.5 # via edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.in
-edx-when==1.1.1 # via -r requirements/edx/base.in, edx-proctoring
+edx-when==1.1.3 # via -r requirements/edx/base.in, edx-proctoring
edxval==1.2.5 # via -r requirements/edx/base.in
elasticsearch==1.9.0 # via edx-search
enum34==1.1.10 # via edxval
@@ -132,7 +132,7 @@ html5lib==1.0.1 # via -r requirements/edx/base.in, ora2
httplib2==0.17.0 # via oauth2
icalendar==4.0.5 # via -r requirements/edx/base.in
idna==2.9 # via -r requirements/edx/paver.txt, requests
-importlib-metadata==1.5.1 # via -r requirements/edx/paver.txt, path
+importlib-metadata==1.5.2 # via -r requirements/edx/paver.txt, path
inflection==0.3.1 # via drf-yasg
ipaddress==1.0.23 # via -r requirements/edx/base.in
isodate==0.6.0 # via python3-saml
diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
index 3a4c28035e0..2fb46034172 100644
--- a/requirements/edx/coverage.txt
+++ b/requirements/edx/coverage.txt
@@ -6,7 +6,7 @@
#
coverage==5.0.4 # via -r requirements/edx/coverage.in
diff-cover==2.6.0 # via -r requirements/edx/coverage.in
-importlib-metadata==1.5.1 # via inflect, pluggy
+importlib-metadata==1.5.2 # via inflect, pluggy
inflect==3.0.2 # via -c requirements/edx/../constraints.txt, jinja2-pluralize
jinja2-pluralize==0.3.0 # via diff-cover
jinja2==2.11.1 # via diff-cover, jinja2-pluralize
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 9591f8b14f5..3f001ca3543 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -33,7 +33,7 @@ attrs==19.3.0 # via -r requirements/edx/testing.txt, edx-ace, jsonsc
babel==2.8.0 # via -r requirements/edx/testing.txt, django-babel, django-babel-underscore, sphinx
beautifulsoup4==4.8.2 # via -r requirements/edx/testing.txt, pynliner
billiard==3.3.0.23 # via -r requirements/edx/testing.txt, celery
-bleach==3.1.3 # via -r requirements/edx/testing.txt, edx-enterprise, lti-consumer-xblock, ora2
+bleach==3.1.4 # via -r requirements/edx/testing.txt, edx-enterprise, lti-consumer-xblock, ora2
bok-choy==1.0.1 # via -r requirements/edx/testing.txt
boto3==1.4.8 # via -r requirements/edx/testing.txt, fs-s3fs
boto==2.39.0 # via -r requirements/edx/testing.txt, django-ses, edxval, ora2
@@ -130,7 +130,7 @@ edx-sphinx-theme==1.5.0 # via -r requirements/edx/development.in
edx-submissions==3.0.4 # via -r requirements/edx/testing.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/testing.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/testing.txt
-edx-when==1.1.1 # via -r requirements/edx/testing.txt, edx-proctoring
+edx-when==1.1.3 # via -r requirements/edx/testing.txt, edx-proctoring
edxval==1.2.5 # via -r requirements/edx/testing.txt
elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search
entrypoints==0.3 # via -r requirements/edx/testing.txt, flake8
@@ -152,11 +152,11 @@ gunicorn==20.0.4 # via -r requirements/edx/testing.txt
help-tokens==1.0.5 # via -r requirements/edx/testing.txt
html5lib==1.0.1 # via -r requirements/edx/testing.txt, ora2
httplib2==0.17.0 # via -r requirements/edx/testing.txt, oauth2
-httpretty==0.9.7 # via -r requirements/edx/testing.txt
+httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
icalendar==4.0.5 # via -r requirements/edx/testing.txt
idna==2.9 # via -r requirements/edx/testing.txt, requests
imagesize==1.2.0 # via sphinx
-importlib-metadata==1.5.1 # via -r requirements/edx/testing.txt, importlib-resources, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv
+importlib-metadata==1.5.2 # via -r requirements/edx/testing.txt, importlib-resources, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv
importlib-resources==1.4.0 # via -r requirements/edx/testing.txt, virtualenv
inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, jinja2-pluralize
inflection==0.3.1 # via -r requirements/edx/testing.txt, drf-yasg
diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt
index 9e6d73c3e12..ed9c1053209 100644
--- a/requirements/edx/paver.txt
+++ b/requirements/edx/paver.txt
@@ -8,7 +8,7 @@ certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
edx-opaque-keys==2.0.2 # via -r requirements/edx/paver.in
idna==2.9 # via requests
-importlib-metadata==1.5.1 # via path
+importlib-metadata==1.5.2 # via path
lazy==1.4 # via -r requirements/edx/paver.in
libsass==0.10.0 # via -r requirements/edx/paver.in
markupsafe==1.1.1 # via -r requirements/edx/paver.in
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 596d2ef9956..ccf62d17e2c 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -32,7 +32,7 @@ attrs==19.3.0 # via -r requirements/edx/base.txt, edx-ace, pytest
babel==2.8.0 # via -r requirements/edx/base.txt, django-babel, django-babel-underscore
beautifulsoup4==4.8.2 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner
billiard==3.3.0.23 # via -r requirements/edx/base.txt, celery
-bleach==3.1.3 # via -r requirements/edx/base.txt, edx-enterprise, lti-consumer-xblock, ora2
+bleach==3.1.4 # via -r requirements/edx/base.txt, edx-enterprise, lti-consumer-xblock, ora2
bok-choy==1.0.1 # via -r requirements/edx/testing.in
boto3==1.4.8 # via -r requirements/edx/base.txt, fs-s3fs
boto==2.39.0 # via -r requirements/edx/base.txt, django-ses, edxval, ora2
@@ -125,7 +125,7 @@ edx-sga==0.10.0 # via -r requirements/edx/base.txt
edx-submissions==3.0.4 # via -r requirements/edx/base.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/base.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.txt
-edx-when==1.1.1 # via -r requirements/edx/base.txt, edx-proctoring
+edx-when==1.1.3 # via -r requirements/edx/base.txt, edx-proctoring
edxval==1.2.5 # via -r requirements/edx/base.txt
elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search
entrypoints==0.3 # via flake8
@@ -147,10 +147,10 @@ gunicorn==20.0.4 # via -r requirements/edx/base.txt
help-tokens==1.0.5 # via -r requirements/edx/base.txt
html5lib==1.0.1 # via -r requirements/edx/base.txt, ora2
httplib2==0.17.0 # via -r requirements/edx/base.txt, oauth2
-httpretty==0.9.7 # via -r requirements/edx/testing.in
+httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in
icalendar==4.0.5 # via -r requirements/edx/base.txt
idna==2.9 # via -r requirements/edx/base.txt, requests
-importlib-metadata==1.5.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-resources, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv
+importlib-metadata==1.5.2 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-resources, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv
importlib-resources==1.4.0 # via virtualenv
inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, jinja2-pluralize
inflection==0.3.1 # via -r requirements/edx/base.txt, drf-yasg
--
GitLab